X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fcluster.rb;h=46d0bec3e63428465dac588002226a1d3a845526;hb=c84cfe794ac75a4180dc551cf57c876e257a907c;hp=543eeba7b76f7cfe2b83b4e99559cb13250888c2;hpb=41cdd39cf1938a79b13edbfe4392ae01a935b503;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/lib/facter/cluster.rb b/modules/debian-org/lib/facter/cluster.rb
index 543eeba7b..46d0bec3e 100644
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -1,21 +1,14 @@
-if FileTest.exist?('/usr/sbin/gnt-cluster') and FileTest.exist?('/var/lib/ganeti/config.data')
+if FileTest.exist?('/usr/sbin/gnt-cluster') and FileTest.exist?('/var/lib/ganeti/ssconf_cluster_name')
 	begin
 		if system('/usr/sbin/gnt-cluster getmaster >/dev/null')
-			require 'yaml'
-			yaml = YAML.load_file('/var/lib/ganeti/config.data')
 			Facter.add('cluster') do
 				setcode do
-					yaml['cluster']['cluster_name']
+					open('/var/lib/ganeti/ssconf_cluster_name').read().chomp()
 				end
-				Facter.add('cluster_nodes') do
-					nodename = []
-					yaml["nodes"].each do |uuid,value|
-						nodename << value["name"]
-					end
-					ret = nodename.join(" ")
-					setcode do
-						ret
-					end
+			end
+			Facter.add('cluster_nodes') do
+				setcode do
+					open('/var/lib/ganeti/ssconf_node_list').read().split().join(" ")
 				end
 			end
 		end