use Facter to get ganeti nodes rather than hiera

[dsa-puppet.git] / modules / motd / templates / motd.erb

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 92dd5c1e5760dd04f58d690ebe0574f972d7f774..4dc5ac5a597703d47f976a75e81523eee5bd4360 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -100,17 +100,16 @@ unless vms.empty?
 end
 
 
-if scope.hiera('cluster')
-  purp += "\nMember of ganeti cluster: " + scope.hiera('cluster') + ".\n"
-  #purp += "\nganeti cluster: " + scope.hiera('cluster') + " contains these nodes:\n"
-  #scope.hiera_array('nodes').each do |node|
-  #  purp += "\t" + node
-  #  if node.eql?(fqdn)
-  #    purp += " (this system)"
-  #  end
-  #  purp += "\n"
-  #end
-  #purp += "\n"
+if scope.lookupvar('::cluster')
+  purp += "\nThis server is a node in ganeti cluster: "
+  purp += scope.lookupvar('::cluster') + ".\n"
+  Puppet::Parser::Functions.function('hiera_array')
+  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