projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
helps to put code in correct block
[mirror/dsa-puppet.git]
/
modules
/
motd
/
templates
/
motd.erb
diff --git
a/modules/motd/templates/motd.erb
b/modules/motd/templates/motd.erb
index
1a3bf19
..
47e4531
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-100,16
+100,12
@@
unless vms.empty?
end
end
-if scope.hiera('cluster')
- purp += "\nganeti cluster: " + hiera('cluster') + " contains these nodes:\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|
scope.hiera_array('nodes').each do |node|
- purp += "\t" + node
- if node.eql?(fqdn)
- purp += " (this system)"
- end
- purp += "\n"
+ purp += "\t" + node + "\n"
end
end
- purp += "\n"
end
end