X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fcluster.rb;h=fea14355f152900c1a1b3dcda28424fa1f5de912;hb=33d6937e49a8ef0990c6eb92eda31dd93efcd5dd;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..fea14355f 100644
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -1,16 +1,16 @@
 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']
+					yaml['cluster']['cluster_name']
 				end
 				end
 				Facter.add('cluster_nodes') do
 				setcode do
-					json['nodes'].keys.join(' ')
+					yaml['nodes'].keys.join(' ')
 				end
 			end
 		end