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
47e4531
..
4dc5ac5
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-103,7
+103,11
@@
end
if scope.lookupvar('::cluster')
purp += "\nThis server is a node in ganeti cluster: "
purp += scope.lookupvar('::cluster') + ".\n"
if scope.lookupvar('::cluster')
purp += "\nThis server is a node in ganeti cluster: "
purp += scope.lookupvar('::cluster') + ".\n"
- scope.hiera_array('nodes').each do |node|
+ 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
purp += "\t" + node + "\n"
end
end