projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cluster_nodes is now an array
[mirror/dsa-puppet.git]
/
modules
/
motd
/
templates
/
motd.erb
diff --git
a/modules/motd/templates/motd.erb
b/modules/motd/templates/motd.erb
index
0838f58
..
50a99dd
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-13,7
+13,14
@@
this machine you agree to abide by the Debian Machines Usage Policies
<%=
def wrap(s, width=78)
<%=
def wrap(s, width=78)
- s.gsub(/(.{1,#{width}})( +|\Z)/, "\\1\n ")
+ #s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n ")
+ s.split("\n").map{ |x|
+ if (x.length > width) then
+ #x.gsub!(/(.{1,#{width}}) +(?=\S)/, "\\1\n ")
+ x.gsub!(/(.{1,#{width}})( +|\Z)/, "\\1\n ")
+ end
+ x
+ }.join("\n")+"\n"
end
def markup(l)
end
def markup(l)
@@
-61,7
+68,7
@@
if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
else
extra += "."
end
else
extra += "."
end
-purp += " " + wrap(extra)
+purp += " " + wrap(extra)
+ "\n"
if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('physicalHost'))
if ninfo['ldap']['physicalHost'][0] =~ /ganeti/
if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('physicalHost'))
if ninfo['ldap']['physicalHost'][0] =~ /ganeti/
@@
-103,13
+110,13
@@
end
if scope.lookupvar('::cluster').to_s != 'undefined'
purp += "\n This server is a node in ganeti cluster: "
purp += scope.lookupvar('::cluster').to_s + ":\n"
if scope.lookupvar('::cluster').to_s != 'undefined'
purp += "\n This server is a node in ganeti cluster: "
purp += scope.lookupvar('::cluster').to_s + ":\n"
- purp += "\t" + scope.lookupvar('::cluster_nodes').
to_s.split.
sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n"
+ purp += "\t" + scope.lookupvar('::cluster_nodes').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
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 = scope.lookupvar('::cluster_nodes').sort
#nodes.each do |node|
# purp += "\t" + node + "\n"
#end
#nodes.each do |node|
# purp += "\t" + node + "\n"
#end
@@
-136,7
+143,6
@@
end
purp
-%>
purp
-%>
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<% if @lsbmajdistrelease >= '7' -%>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<% if @lsbmajdistrelease >= '7' -%>