X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=3160aecbed1b9cad227a7cde6d5dcc2841ad2047;hb=064f700b25873ec2c937995c8eaa90f3ea76b877;hp=42edb0cbc639a4eb80b0bce39a42d9fdd2642d11;hpb=124e041c35aba39832a92d262407b643f9b7b07b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 42edb0cbc..3160aecbe 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -50,13 +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>'.\n"
-      extra += "Use 'schroot-list-sessions' to list your open sessions.\n"
+      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')
@@ -122,17 +117,39 @@ 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
+
+
+if ninfo['not-bacula-client'] then
+  purp += "\n Note that this host is _NOT_ being backed up.  If you care about your\n" +
+            " data, run your own backups.\n"
+end
+
+if classes.include?("porterbox")
+  purp += "\nPlease clean up any schroots after you are done using them.  Please also\n" +
+    "remove any build and source trees in your home directory once you no longer\n" +
+    "need them.  Disk space on porter machines often is scarce.  If it becomes\n" +
+    "necessary we will delete your entire home directory without warning, but this\n" +
+    "really implies that you have been misusing resources.  We would prefer this\n" +
+    "not become necessary.\n" +
+    "  *** Clean up behind you! ***\n"
 end