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

diff --git a/modules/debian-org/lib/facter/cluster.rb b/modules/debian-org/lib/facter/cluster.rb
index 6dee99f87..c6b00f6b1 100644
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -1,12 +1,16 @@
-Facter.add('cluster') do
-  setcode do
-    if system('/usr/sbin/gnt-cluster getmaster')
-      require 'json'
-      config = '/var/lib/ganeti/config.data'
-      if FileTest.exist?(config)
+if FileTest.exist?('/usr/sbin/gnt-cluster')
+  if system('/usr/sbin/gnt-cluster getmaster >/dev/null')
+    require 'json'
+    config = '/var/lib/ganeti/config.data'
+    Facter.add('cluster') do
+      setcode do
         JSON.parse(File.read(config))['cluster']['cluster_name']
-      else
-        ''
       end
+    end
+    Facter.add('cluster_nodes') do
+      setcode do
+        JSON.parse(File.read(config))['nodes'].keys
+      end
+    end
   end
 end