From ea9f1d19a83af92bf7b3924f4f32caa35c66effb Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 29 May 2013 13:46:09 +0000 Subject: [PATCH] ganeti motd change --- modules/motd/templates/motd.erb | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb index 42edb0cbc..7f774d177 100644 --- a/modules/motd/templates/motd.erb +++ b/modules/motd/templates/motd.erb @@ -122,17 +122,23 @@ end if scope.lookupvar('::cluster').to_s != 'undefined' purp += "\nThis server is a node in ganeti cluster: " - 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 + purp += scope.lookupvar('::cluster').to_s + ":\n" + purp += "\t" + scope.lookupvar('::cluster_nodes').to_s.split.sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n" + + if @lsbmajdistrelease >= '7' + purp += "" + purp += "\tCurrently the master node is $(cat /var/lib/ganeti/ssconf_master_node).\n" end + #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 -- 2.20.1