Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

[dsa-puppet.git] / modules / ssh / templates / authorized_keys.erb

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index b7225a56679e9cfc307bea7501d55f79ea28ec83..25083be0d4a0573efe7ba5424bae79e686be30c4 100644 (file)
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -22,12 +22,14 @@ localkeys
 <%=
   ganetikeys = []
   allnodeinfo = scope.lookupvar('site::allnodeinfo')
-  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 << "from=\"#{allnodeinfo[node]['ipHostNumber'].join(',')}\" #{allnodeinfo[node]['sshRSAHostKey'].to_s}"
-    else
-      ganetikeys << "# host #{node} not found in allnodeinfo"
+  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 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
   end
   ganetikeys.join("\n");