use Facter to get ganeti nodes rather than hiera

diff --git a/modules/debian-org/lib/facter/cluster.rb b/modules/debian-org/lib/facter/cluster.rb
index fda38f98b541d274aec67a02033ca1e466e549eb..c6b00f6b1f3c1ba146ebe78705139a4deaba43d8 100644 (file)
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -7,5 +7,10 @@ if FileTest.exist?('/usr/sbin/gnt-cluster')
         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
 end

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 829994b4bbd376fe7fedbeaa11050dc57d66c84b..4dc5ac5a597703d47f976a75e81523eee5bd4360 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -107,6 +107,9 @@ if scope.lookupvar('::cluster')
   scope.function_hiera_array('nodes').each do |node|
     purp += "\t" + node + "\n"
   end
+  scope.lookupvar('::cluster_nodes').each do |node|
+    purp += "\t" + node + "\n"
+  end
 end