From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 7 Jul 2014 10:02:29 +0000 (+0200)
Subject: Try new factor that also works on non-master-candiate nodes
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c2a282f3cca5df423cd773ff7bba5b409bdf763e;p=mirror%2Fdsa-puppet.git

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 543eeba7b..c9b22ac63 100644
--- 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