add bugs_search

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

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 92dd5c1..45e529a 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -100,17 +100,19 @@ unless vms.empty?
 end
 
 
-if scope.hiera('cluster')
-  purp += "\nMember of ganeti cluster: " + scope.hiera('cluster') + ".\n"
-  #purp += "\nganeti cluster: " + scope.hiera('cluster') + " contains these nodes:\n"
-  #scope.hiera_array('nodes').each do |node|
-  #  purp += "\t" + node
-  #  if node.eql?(fqdn)
-  #    purp += " (this system)"
-  #  end
-  #  purp += "\n"
-  #end
-  #purp += "\n"
+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