Revert "try to get node names this way"

[dsa-puppet.git] / modules / debian-org / lib / facter / cluster.rb

diff --git a/modules/debian-org/lib/facter/cluster.rb b/modules/debian-org/lib/facter/cluster.rb
index c6b00f6b1f3c1ba146ebe78705139a4deaba43d8..fea14355f152900c1a1b3dcda28424fa1f5de912 100644 (file)
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -1,16 +1,19 @@
-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']
-      end
-    end
-    Facter.add('cluster_nodes') do
-      setcode do
-        JSON.parse(File.read(config))['nodes'].keys
-      end
-    end
-  end
+if FileTest.exist?('/usr/sbin/gnt-cluster') and FileTest.exist?('/var/lib/ganeti/config.data')
+       begin
+               if system('/usr/sbin/gnt-cluster getmaster >/dev/null')
+                       require 'yaml'
+                       yaml = YAML.load_file('/var/lib/ganeti/config.data')
+                       Facter.add('cluster') do
+                               setcode do
+                                       yaml['cluster']['cluster_name']
+                               end
+                               end
+                               Facter.add('cluster_nodes') do
+                               setcode do
+                                       yaml['nodes'].keys.join(' ')
+                               end
+                       end
+               end
+       rescue Exception => e
+       end
 end