From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 7 Jul 2014 10:06:30 +0000 (+0200)
Subject: Except that doesn't work
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a378504146b456af9ff178d6011088d1585d732e;p=mirror%2Fdsa-puppet.git

Except that doesn't work
---

diff --git a/modules/debian-org/lib/facter/cluster.rb b/modules/debian-org/lib/facter/cluster.rb
index c9b22ac63..46d0bec3e 100644
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -8,7 +8,7 @@ if FileTest.exist?('/usr/sbin/gnt-cluster') and FileTest.exist?('/var/lib/ganeti
 			end
 			Facter.add('cluster_nodes') do
 				setcode do
-					open('/var/lib/ganeti/ssconf_node_list').read().split()
+					open('/var/lib/ganeti/ssconf_node_list').read().split().join(" ")
 				end
 			end
 		end
diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 50a99dd6a..cfed6dca8 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -110,7 +110,7 @@ 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').sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n"
+  purp += "\t" + scope.lookupvar('::cluster_nodes').split.sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n"
 
   if @lsbmajdistrelease >= '7'
     purp += ""
diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index 86f6471d1..c80a02ef0 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').sort.each do |node|
+    scope.lookupvar('::cluster_nodes').split.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]}"