projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Install server certs into /etc/ssl/debian also
[mirror/dsa-puppet.git]
/
modules
/
motd
/
templates
/
motd.erb
diff --git
a/modules/motd/templates/motd.erb
b/modules/motd/templates/motd.erb
index
829994b
..
2430bb1
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-100,13
+100,19
@@
unless vms.empty?
end
end
-if scope.lookupvar('::cluster')
+if scope.lookupvar('::cluster')
.to_s != 'undefined'
purp += "\nThis server is a node in ganeti cluster: "
purp += "\nThis server is a node in ganeti cluster: "
- purp += scope.lookupvar('::cluster') + ".\n"
- Puppet::Parser::Functions.function('hiera_array')
-
scope.function_hiera_array('nodes')
.each do |node|
+ 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
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
end