X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Ftemplates%2Fauthorized_keys.erb;h=25083be0d4a0573efe7ba5424bae79e686be30c4;hb=b21fad4017fbc804fd4645cf893a87a7bf595f2b;hp=2b00e56f883a651ba296aa5ae82fee9c76a1b31f;hpb=abcd14cf6215dbeb3bc064c99941e71e8eb9fba9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index 2b00e56f8..25083be0d 100644
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -22,17 +22,17 @@ localkeys
 <%=
   ganetikeys = []
   allnodeinfo = scope.lookupvar('site::allnodeinfo')
-  if scope.lookupvar('::cluster_nodes')
-    scope.lookupvar('::cluster_nodes').split.sort.each do |node|
+  if scope.lookupvar('::cluster').to_s != 'undefined'
+    scope.lookupvar('::cluster_nodes').to_s.split.sort.each do |node|
       if allnodeinfo.has_key?(node)
-        ganetikeys << "# for ganeti: #{allnodeinfo[node]['hostname'].to_s}"
+        ganetikeys << "# for ganeti cluster #{scope.lookupvar('::cluster').to_s}: #{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