X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fcluster.rb;h=46d0bec3e63428465dac588002226a1d3a845526;hb=6832fcf5d8cbc0071e33a54d0c2c186cb3c6c775;hp=6dee99f87dbecd762a462e3e1a55a01595d21a8a;hpb=5f7c97946997b63e32b009b11578159e826229ad;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/lib/facter/cluster.rb b/modules/debian-org/lib/facter/cluster.rb
index 6dee99f87..46d0bec3e 100644
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -1,12 +1,17 @@
-Facter.add('cluster') do
-  setcode do
-    if system('/usr/sbin/gnt-cluster getmaster')
-      require 'json'
-      config = '/var/lib/ganeti/config.data'
-      if FileTest.exist?(config)
-        JSON.parse(File.read(config))['cluster']['cluster_name']
-      else
-        ''
-      end
-  end
+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')
+			Facter.add('cluster') do
+				setcode do
+					open('/var/lib/ganeti/ssconf_cluster_name').read().chomp()
+				end
+			end
+			Facter.add('cluster_nodes') do
+				setcode do
+					open('/var/lib/ganeti/ssconf_node_list').read().split().join(" ")
+				end
+			end
+		end
+	rescue Exception => e
+	end
 end