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

diff --git a/modules/debian-org/lib/facter/cluster.rb b/modules/debian-org/lib/facter/cluster.rb
index d7ef867d0..46d0bec3e 100644
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -1,16 +1,17 @@
-if FileTest.exist?('/usr/sbin/gnt-cluster') and FileTest.exist?('/var/lib/ganeti/config.data')
-  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/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