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=dfff4368087d43fb711f70196a07ec93a167ba35;hpb=01582bb9d2032004c93659ae761fae87559657d1;p=mirror%2Fdsa-puppet.git

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