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=c6b00f6b1f3c1ba146ebe78705139a4deaba43d8;hpb=a2fbbfd82aa339ef029a12e273009e9ac7690c81;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/lib/facter/cluster.rb b/modules/debian-org/lib/facter/cluster.rb
index c6b00f6b1..fea14355f 100644
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -1,16 +1,19 @@
-if FileTest.exist?('/usr/sbin/gnt-cluster')
-  if system('/usr/sbin/gnt-cluster getmaster >/dev/null')
-    require 'json'
-    config = '/var/lib/ganeti/config.data'
-    Facter.add('cluster') do
-      setcode do
-        JSON.parse(File.read(config))['cluster']['cluster_name']
-      end
-    end
-    Facter.add('cluster_nodes') do
-      setcode do
-        JSON.parse(File.read(config))['nodes'].keys
-      end
-    end
-  end
+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 'yaml'
+			yaml = YAML.load_file('/var/lib/ganeti/config.data')
+			Facter.add('cluster') do
+				setcode do
+					yaml['cluster']['cluster_name']
+				end
+				end
+				Facter.add('cluster_nodes') do
+				setcode do
+					yaml['nodes'].keys.join(' ')
+				end
+			end
+		end
+	rescue Exception => e
+	end
 end