From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 7 Jul 2014 10:05:14 +0000 (+0200)
Subject: cluster_nodes is now an array
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e3547a89085e966acf32202ac13a2b492e8282b7;p=mirror%2Fdsa-puppet.git

cluster_nodes is now an array
---

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index dcf02fabe..50a99dd6a 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -110,13 +110,13 @@ end
 if scope.lookupvar('::cluster').to_s != 'undefined'
   purp += "\n This server is a node in ganeti cluster: "
   purp += scope.lookupvar('::cluster').to_s + ":\n"
-  purp += "\t" + scope.lookupvar('::cluster_nodes').to_s.split.sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n"
+  purp += "\t" + scope.lookupvar('::cluster_nodes').sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n"
 
   if @lsbmajdistrelease >= '7'
     purp += ""
     purp += "\tCurrently the master node is $(cat /var/lib/ganeti/ssconf_master_node).\n"
   end
-  #nodes = scope.lookupvar('::cluster_nodes').to_s.split.sort
+  #nodes = scope.lookupvar('::cluster_nodes').sort
   #nodes.each do |node|
   #  purp += "\t" + node + "\n"
   #end
diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index 7586e57d2..86f6471d1 100644
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -14,7 +14,7 @@ localkeys
   ganetikeys = []
   allnodeinfo = scope.lookupvar('site::allnodeinfo')
   if scope.lookupvar('::cluster').to_s != 'undefined'
-    scope.lookupvar('::cluster_nodes').to_s.split.sort.each do |node|
+    scope.lookupvar('::cluster_nodes').sort.each do |node|
       if allnodeinfo.has_key?(node)
         ganetikeys << "# for ganeti cluster #{scope.lookupvar('::cluster').to_s}: #{allnodeinfo[node]['hostname'][0]}"
         ganetikeys << "from=\"#{allnodeinfo[node]['ipHostNumber'].join(',')}\" #{allnodeinfo[node]['sshRSAHostKey'][0]}"