From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 12 Jul 2012 13:08:29 +0000 (+0200)
Subject: Say which ganeti cluster we are in
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b1ee567a819e87a842c95b14c5aa7cbbae21dd41;hp=9aa4b90f477f99fdf2635f0a81a74d6d14eec9c1;p=dsa-puppet.git

Say which ganeti cluster we are in
---

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index 1d688647..a85ee350 100644
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -25,7 +25,7 @@ localkeys
   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"