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=f6bff1a5b5023a2c1fca0bc8ecd153f7b441c87b;hpb=02057a301766a68fc83e6753a99fa48a4d046062;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/lib/facter/cluster.rb b/modules/debian-org/lib/facter/cluster.rb
index f6bff1a5b..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'
-    json = JSON.parse(File.read('/var/lib/ganeti/config.data'))
-    Facter.add('cluster') do
-      setcode do
-        json['cluster']['cluster_name']
-      end
-    end
-    Facter.add('cluster_nodes') do
-      setcode do
-        json['nodes'].keys.join(' ')
-      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