a little more defense

[mirror/dsa-puppet.git] / modules / motd / templates / motd.erb

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index d5cc580..57b05e4 100644 (file)
--- 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 not scope.lookupvar('::cluster').to_s.empty?
   purp += "\nThis server is a node in ganeti cluster: "
   purp += scope.lookupvar('::cluster') + ".\n"
-  scope.lookupvar('::cluster_nodes').split.each do |node|
+  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