X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=2430bb1dd7020ffcc7192a1fd90bd00c49f5eeb9;hb=28b8eb9885fb9425923104181d707637d5f35e83;hp=2b6370899e5e42e27f28bf55a1219aee9e51f5c2;hpb=4e45280a2115fc85d8b49479076e9cf0a1907b38;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 2b6370899..2430bb1dd 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -100,13 +100,19 @@ unless vms.empty?
 end
 
 
-if scope.lookupvar('::cluster')
+if scope.lookupvar('::cluster').to_s != 'undefined'
   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 += scope.lookupvar('::cluster').to_s + ".\n"
+  nodes = scope.lookupvar('::cluster_nodes').to_s.split.sort
+  nodes.each do |node|
     purp += "\t" + node + "\n"
   end
+  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