projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pg access quantz->ullmann
[mirror/dsa-puppet.git]
/
modules
/
motd
/
templates
/
motd.erb
diff --git
a/modules/motd/templates/motd.erb
b/modules/motd/templates/motd.erb
index
45e529a
..
2430bb1
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-100,10
+100,10
@@
unless vms.empty?
end
end
-if
not scope.lookupvar('::cluster').empty?
+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"
- nodes = scope.lookupvar('::cluster_nodes').split.sort
+ 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
nodes.each do |node|
purp += "\t" + node + "\n"
end