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

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 4dc5ac5a5..45e529ab6 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -100,15 +100,18 @@ unless vms.empty?
 end
 
 
-if scope.lookupvar('::cluster')
+if not scope.lookupvar('::cluster').empty?
   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|
+  nodes = scope.lookupvar('::cluster_nodes').split.sort
+  nodes.each do |node|
     purp += "\t" + node + "\n"
   end
-  scope.lookupvar('::cluster_nodes').each do |node|
+  nodes.reject{|node| node.eql?(fqdn)}.each do |node|
     purp += "\t" + node + "\n"
+    scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
+      purp += "\t\t" + ip + "\n"
+    end
   end
 end