From: Stephen Gran <steve@lobefin.net>
Date: Sun, 24 Jun 2012 09:00:38 +0000 (+0100)
Subject: calling split on undefined is naughty
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=abcd14cf6215dbeb3bc064c99941e71e8eb9fba9;hp=83df2a0b3fd2d493c04fb117f5c7aa86e04582c4;p=dsa-puppet.git

calling split on undefined is naughty

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index f0064248..2b00e56f 100644
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -22,15 +22,17 @@ localkeys
 <%=
   ganetikeys = []
   allnodeinfo = scope.lookupvar('site::allnodeinfo')
-  scope.lookupvar('::cluster_nodes').split.sort.each do |node|
-    if allnodeinfo.has_key?(node)
-      ganetikeys << "# for ganeti: #{allnodeinfo[node]['hostname'].to_s}"
-      ganetikeys << "from=\"#{allnodeinfo[node]['ipHostNumber'].join(',')}\" #{allnodeinfo[node]['sshRSAHostKey'].to_s}"
-    else
-      ganetikeys << "# host #{node} not found in allnodeinfo"
+  if scope.lookupvar('::cluster_nodes')
+    scope.lookupvar('::cluster_nodes').split.sort.each do |node|
+      if allnodeinfo.has_key?(node)
+        ganetikeys << "# for ganeti: #{allnodeinfo[node]['hostname'].to_s}"
+        ganetikeys << "from=\"#{allnodeinfo[node]['ipHostNumber'].join(',')}\" #{allnodeinfo[node]['sshRSAHostKey'].to_s}"
+      else
+        ganetikeys << "# host #{node} not found in allnodeinfo"
+      end
     end
+    ganetikeys.join("\n");
   end
-  ganetikeys.join("\n");
 %>
 #
 # DSA