X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=5c440cdf9934a8199fd48251ecc90fabb1234227;hb=206524a32e769b40cd66b33b5468d3a64a9b5b4a;hp=9255b9b0e13daab610c0f054d6415020d5d6b23b;hpb=8a1b2b52bbd5d451e73b7469108133c53c5d4c69;p=dsa-puppet.git

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 9255b9b0..5c440cdf 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -1,4 +1,4 @@
-<% if @lsbdistcodename == 'wheezy' -%>
+<% if @lsbmajdistrelease >= '7' -%>
 #!/bin/bash
 
 cat <<EOD
@@ -50,12 +50,8 @@ if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
     purp += " porterbox"
     extra += "\n"
     if classes.include?("porterbox")
-      extra += "See 'schroot -l' for a list of available chroots.  Start new sessions\n"
-      extra += "with 'schroot --begin-session -c <chroot>', run commands in sessions using\n"
-      extra += "\schroot --run-session -c <session> [-- command]\, and tear down sessions\n"
-      extra += "using \schroot --end-session -c <session>'.  You can run a limited set of\n"
-      extra += "privileged commands, for instance some of apt-get, using\n"
-      extra += "'dd-schroot-cmd -c <session> <command>'."
+      extra += "For an introduction to the porterbox 'schroot' tool, see:\n"
+      extra += "  <URL:http://dsa.debian.org/doc/schroot/>.\n"
     else
       extra += "See 'dchroot -l' or 'schroot -l' for a list of available chroots.\n"
       if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('admin')
@@ -121,17 +117,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
 
 
@@ -144,7 +146,7 @@ purp
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-<% if @lsbdistcodename == 'wheezy' -%>
+<% if @lsbmajdistrelease >= '7' -%>
 EOD
 <% end -%>
 <%