X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=2430bb1dd7020ffcc7192a1fd90bd00c49f5eeb9;hb=81539d50730aeffc1418d8f597a90587ba1594a0;hp=d5cc58047e4b8a10cfd399584b1ab3e6e958874e;hpb=68ae941207abb9f652c1602e4c74ea131a5482f3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index d5cc58047..2430bb1dd 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -100,12 +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"
-  scope.lookupvar('::cluster_nodes').split.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