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

diff --git a/modules/debian-org/lib/facter/cluster.rb b/modules/debian-org/lib/facter/cluster.rb
index c6b00f6b1..d7ef867d0 100644
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -1,15 +1,15 @@
-if FileTest.exist?('/usr/sbin/gnt-cluster')
+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'
-    config = '/var/lib/ganeti/config.data'
+    json = JSON.parse(File.read('/var/lib/ganeti/config.data'))
     Facter.add('cluster') do
       setcode do
-        JSON.parse(File.read(config))['cluster']['cluster_name']
+        json['cluster']['cluster_name']
       end
     end
     Facter.add('cluster_nodes') do
       setcode do
-        JSON.parse(File.read(config))['nodes'].keys
+        json['nodes'].keys.join(' ')
       end
     end
   end