X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=45e529ab6933eb029ceafaf6ba532041138655c7;hb=688ae7d46e7cc388b893aadf3a21b0df692c7562;hp=3fdf393ae5b82d74a22e877d49fe6862a565e03d;hpb=8390620532c7a4fa2b88af42f7a247f4c2b6fba3;p=dsa-puppet.git

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 3fdf393a..45e529ab 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -100,17 +100,24 @@ unless vms.empty?
 end
 
 
-if scope.lookupvar('::cluster')
-  purp += "\nThis machine is a node in ganeti cluster: "
+if not scope.lookupvar('::cluster').empty?
+  purp += "\nThis server is a node in ganeti cluster: "
   purp += scope.lookupvar('::cluster') + ".\n"
+  nodes = scope.lookupvar('::cluster_nodes').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
 
 
 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