stop using hiera

[dsa-puppet.git] / modules / motd / templates / motd.erb

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 1a3bf1988e3dd41033e7025804f03b65d1df633c..d5cc58047e4b8a10cfd399584b1ab3e6e958874e 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -100,16 +100,12 @@ unless vms.empty?
 end
 
 
-if scope.hiera('cluster')
-  purp += "\nganeti cluster: " + hiera('cluster') + " contains these nodes:\n"
-  scope.hiera_array('nodes').each do |node|
-    purp += "\t" + node
-    if node.eql?(fqdn)
-      purp += " (this system)"
-    end
-    purp += "\n"
+if scope.lookupvar('::cluster')
+  purp += "\nThis server is a node in ganeti cluster: "
+  purp += scope.lookupvar('::cluster') + ".\n"
+  scope.lookupvar('::cluster_nodes').split.each do |node|
+    purp += "\t" + node + "\n"
   end
-  purp += "\n"
 end