X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fcluster.rb;h=543eeba7b76f7cfe2b83b4e99559cb13250888c2;hb=a6012e0fea1fe12fe126b07c1c949046ef8e8f65;hp=dfff4368087d43fb711f70196a07ec93a167ba35;hpb=01582bb9d2032004c93659ae761fae87559657d1;p=mirror%2Fdsa-puppet.git

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