projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use Facter to get ganeti nodes rather than hiera
[mirror/dsa-puppet.git]
/
modules
/
motd
/
templates
/
motd.erb
diff --git
a/modules/motd/templates/motd.erb
b/modules/motd/templates/motd.erb
index
3fdf393
..
4dc5ac5
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-101,16
+101,20
@@
end
if scope.lookupvar('::cluster')
if scope.lookupvar('::cluster')
- purp += "\nThis
machine
is a node in ganeti cluster: "
+ purp += "\nThis
server
is a node in ganeti cluster: "
purp += scope.lookupvar('::cluster') + ".\n"
purp += scope.lookupvar('::cluster') + ".\n"
+ Puppet::Parser::Functions.function('hiera_array')
+ scope.function_hiera_array('nodes').each do |node|
+ purp += "\t" + node + "\n"
+ end
+ scope.lookupvar('::cluster_nodes').each do |node|
+ purp += "\t" + node + "\n"
+ end
end
if scope.lookupvar('site::nodeinfo').has_key?('footer')
purp += "\n" + wrap(scope.lookupvar('site::nodeinfo')['footer']) + "\n"
end
if scope.lookupvar('site::nodeinfo').has_key?('footer')
purp += "\n" + wrap(scope.lookupvar('site::nodeinfo')['footer']) + "\n"
- scope.hiera_array('nodes').each do |node|
- purp += "\t" + node + "\n"
- end
end
purp
end
purp