X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fcluster.rb;h=46d0bec3e63428465dac588002226a1d3a845526;hb=5f6e6af5773f9a435f4d78946b616988d8245200;hp=84066de809f7391869253e3cb366171e169d6b28;hpb=83940f5dadd68d50afe4191c70ac882f8e676115;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/lib/facter/cluster.rb b/modules/debian-org/lib/facter/cluster.rb
index 84066de80..46d0bec3e 100644
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -1,17 +1,17 @@
-Facter.add('cluster') do
-  setcode do
-    if FileTest.exist?('/usr/sbin/gnt-cluster')
-      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
-    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