X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=ff1db76c192515d039b02fe733403d1a267f26ca;hb=6278249402190ae54f83f98fe50521c64d612368;hp=8622602296ecc949c3fcfb1ecd26899b932863c0;hpb=5275770968b17ca00ae43f19c92ffa825cda6f71;p=mirror%2Fdsa-puppet.git
diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 862260229..ff1db76c1 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 <.\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 ', run commands in sessions using\n"
+ extra += "'schroot --run-session -c [-- command]', and tear down sessions\n"
+ extra += "using 'schroot --end-session -c '. You can run a limited set of\n"
+ extra += "privileged commands, for instance some of apt-get, using\n"
+ extra += "'dd-schroot-cmd -c '.\n"
+ extra += "Use 'schroot --list --all-sessions' or 'schroot-list-sessions []'\n"
+ extra += "to list (your) open sessions.\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')
+ extra += "Please contact #{ninfo['ldap']['admin'][0]} for install requests,\n"
+ extra += "following the recommendations in .\n"
+ end
end
end
@@ -112,17 +123,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
@@ -135,7 +152,7 @@ purp
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-<% if @lsbdistcodename == 'wheezy' -%>
+<% if @lsbmajdistrelease >= '7' -%>
EOD
<% end -%>
<%