]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
calling split on undefined is naughty
authorStephen Gran <steve@lobefin.net>
Sun, 24 Jun 2012 09:00:38 +0000 (10:00 +0100)
committerStephen Gran <steve@lobefin.net>
Sun, 24 Jun 2012 09:00:38 +0000 (10:00 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/ssh/templates/authorized_keys.erb

index f006424861ca982a8fed3f568588beb4f7d21c3a..2b00e56f883a651ba296aa5ae82fee9c76a1b31f 100644 (file)
@@ -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