projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
89b1c3b
)
scope.hiera()
author
Luca Filipozzi
<lfilipoz@emyr.net>
Wed, 16 May 2012 18:16:19 +0000
(18:16 +0000)
committer
Luca Filipozzi
<lfilipoz@emyr.net>
Wed, 16 May 2012 18:16:19 +0000
(18:16 +0000)
modules/motd/templates/motd.erb
patch
|
blob
|
history
diff --git
a/modules/motd/templates/motd.erb
b/modules/motd/templates/motd.erb
index
9f9db8c
..
1a3bf19
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-100,11
+100,9
@@
unless vms.empty?
end
-Puppet::Parser::Functions.function(:hiera)
-Puppet::Parser::Functions.function(:hiera_array)
-if hiera('cluster')
+if scope.hiera('cluster')
purp += "\nganeti cluster: " + hiera('cluster') + " contains these nodes:\n"
- hiera_array('nodes').each do |node|
+
scope.
hiera_array('nodes').each do |node|
purp += "\t" + node
if node.eql?(fqdn)
purp += " (this system)"