X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fcluster.rb;h=46d0bec3e63428465dac588002226a1d3a845526;hb=d55193d32bcface5935ae2a6acc2cdc6eed71a80;hp=3588868c98a6e856cef7e77f9bb4cb421b2c7440;hpb=e6a9e094a8b2df1271c39f08472b788fe3e3d0c8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/lib/facter/cluster.rb b/modules/debian-org/lib/facter/cluster.rb
index 3588868c9..46d0bec3e 100644
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -1,13 +1,17 @@
-Facter.add('cluster') do
-  setcode do
-    if system('/usr/sbin/gnt-cluster getmaster >/dev/null')
-      require 'json'
-      config = '/var/lib/ganeti/config.data'
-      if FileTest.exist?(config)
-        JSON.parse(File.read(config))['cluster']['cluster_name']
-      else
-        ''
-      end
-    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