X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=45e529ab6933eb029ceafaf6ba532041138655c7;hb=59a2cc3e48fbcae69ea87ed198e46d6b8a6859c8;hp=8844871c7a93ec28f96db5a1e36d992a2d106738;hpb=e6a9e094a8b2df1271c39f08472b788fe3e3d0c8;p=mirror%2Fdsa-puppet.git

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