From: Stephen Gran <steve@lobefin.net>
Date: Sun, 24 Jun 2012 09:02:55 +0000 (+0100)
Subject: better way of being defensive
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=41e6becc320af09a089e2741414baa371b84a95e;hp=abcd14cf6215dbeb3bc064c99941e71e8eb9fba9;p=dsa-puppet.git

better way of being defensive

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 2b00e56f..eb104389 100644
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -22,17 +22,15 @@ localkeys
 <%=
   ganetikeys = []
   allnodeinfo = scope.lookupvar('site::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
+  scope.lookupvar('::cluster_nodes').to_a.flatten.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
-    ganetikeys.join("\n");
   end
+  ganetikeys.join("\n");
 %>
 #
 # DSA