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

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 3fdf393ae..4dc5ac5a5 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -101,16 +101,20 @@ end
 
 
 if scope.lookupvar('::cluster')
-  purp += "\nThis machine is a node in ganeti 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
 
 
 if scope.lookupvar('site::nodeinfo').has_key?('footer')
   purp += "\n" + wrap(scope.lookupvar('site::nodeinfo')['footer']) + "\n"
-  scope.hiera_array('nodes').each do |node|
-    purp += "\t" + node + "\n"
-  end
 end
 
 purp