From: Luca Filipozzi <lfilipoz@emyr.net>
Date: Wed, 16 May 2012 19:51:42 +0000 (+0000)
Subject: helps to put code in correct block
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a84f32b02244c18130bc32f6b410367af2c07279;p=mirror%2Fdsa-puppet.git

helps to put code in correct block
---

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index bb8c785e5..47e4531be 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -101,17 +101,16 @@ end
 
 
 if scope.lookupvar('::cluster')
-  purp += "\nThis machine is a node in ganeti cluster: "
+  purp += "\nThis server is a node in ganeti cluster: "
   purp += scope.lookupvar('::cluster') + ".\n"
+  scope.hiera_array('nodes').each do |node|
+    purp += "\t" + node + "\n"
+  end
 end
 
 
 if scope.lookupvar('site::nodeinfo').has_key?('footer')
-  Puppet::Parser::Functions.function('hiera_array')
   purp += "\n" + wrap(scope.lookupvar('site::nodeinfo')['footer']) + "\n"
-  scope.function_hiera_array('nodes').each do |node|
-    purp += "\t" + node + "\n"
-  end
 end
 
 purp