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=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..d7ef867d0 100644
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -1,12 +1,15 @@
-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
-        ''
+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