X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=4dc5ac5a597703d47f976a75e81523eee5bd4360;hb=a2fbbfd82aa339ef029a12e273009e9ac7690c81;hp=9f9db8cb4fe755bf51660ec891675f4ac089c0d4;hpb=89b1c3b6eeb6be1de39bc8a3927079e681b197e2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 9f9db8cb4..4dc5ac5a5 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -100,18 +100,16 @@ unless vms.empty?
 end
 
 
-Puppet::Parser::Functions.function(:hiera) 
-Puppet::Parser::Functions.function(:hiera_array) 
-if hiera('cluster')
-  purp += "\nganeti cluster: " + hiera('cluster') + " contains these nodes:\n"
-  hiera_array('nodes').each do |node|
-    purp += "\t" + node
-    if node.eql?(fqdn)
-      purp += " (this system)"
-    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
-  purp += "\n"
 end