use facter

diff --git a/hieradata/clusters/ganeti2.debian.org.yaml b/hieradata/clusters/ganeti2.debian.org.yaml
deleted file mode 100644 (file)
index 778939a..0000000
--- a/hieradata/clusters/ganeti2.debian.org.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-nodes:
-  - 'pasquini.debian.org'
-  - 'tristano.debian.org'

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 92dd5c1..f13ee1a 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -100,17 +100,8 @@ unless vms.empty?
 end
 
 
-if scope.hiera('cluster')
-  purp += "\nMember of ganeti cluster: " + scope.hiera('cluster') + ".\n"
-  #purp += "\nganeti cluster: " + scope.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"
-  #end
-  #purp += "\n"
+if scope.lookupvar('site::nodeinfo').has_key?('cluster')
+  purp += "\nMember of a ganeti cluster.\n"
 end