X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=2430bb1dd7020ffcc7192a1fd90bd00c49f5eeb9;hb=f0dbf198d87cdfdca07aece29f03732383144e43;hp=2ad94446cb42e4e8a4927f710e8f5337b14632af;hpb=2c5f10d157a639c69fd9a26fe937b7e433abc76a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 2ad94446c..2430bb1dd 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -100,14 +100,14 @@ unless vms.empty?
 end
 
 
-if not scope.lookupvar('::cluster').empty?
+if scope.lookupvar('::cluster').to_s != 'undefined'
   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.reject{|node| node.eql?(fqdn)}.each do
+  nodes.reject{|node| node.eql?(fqdn)}.each do |node|
     purp += "\t" + node + "\n"
     scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
       purp += "\t\t" + ip + "\n"