Try new factor that also works on non-master-candiate nodes

diff --git a/modules/debian-org/lib/facter/cluster.rb b/modules/debian-org/lib/facter/cluster.rb
index 543eeba7b76f7cfe2b83b4e99559cb13250888c2..c9b22ac639bcac043b3bbd5d0bcd6015b988863c 100644 (file)
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -1,21 +1,14 @@
-if FileTest.exist?('/usr/sbin/gnt-cluster') and FileTest.exist?('/var/lib/ganeti/config.data')
+if FileTest.exist?('/usr/sbin/gnt-cluster') and FileTest.exist?('/var/lib/ganeti/ssconf_cluster_name')
        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']
+                                       open('/var/lib/ganeti/ssconf_cluster_name').read().chomp()
                                end
-                               Facter.add('cluster_nodes') do
-                                       nodename = []
-                                       yaml["nodes"].each do |uuid,value|
-                                               nodename << value["name"]
-                                       end
-                                       ret = nodename.join(" ")
-                                       setcode do
-                                               ret
-                                       end
+                       end
+                       Facter.add('cluster_nodes') do
+                               setcode do
+                                       open('/var/lib/ganeti/ssconf_node_list').read().split()
                                end
                        end
                end