X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fcluster.rb;fp=modules%2Fdebian-org%2Flib%2Ffacter%2Fcluster.rb;h=84066de809f7391869253e3cb366171e169d6b28;hb=83940f5dadd68d50afe4191c70ac882f8e676115;hp=3588868c98a6e856cef7e77f9bb4cb421b2c7440;hpb=de8a6a46e91e3bb9af8ba0cdef5af85eea29e89a;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..84066de80 100644
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -1,13 +1,17 @@
 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')
+      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
+          ''
+        end
       end
+    else
+      ''
     end
   end
 end