From 159eee2c30af17dc14cf7c9b833678afc68b292e Mon Sep 17 00:00:00 2001 From: Luca Filipozzi Date: Wed, 16 May 2012 18:28:58 +0000 Subject: [PATCH] use facter --- hieradata/clusters/ganeti2.debian.org.yaml | 4 ---- modules/motd/templates/motd.erb | 13 ++----------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 hieradata/clusters/ganeti2.debian.org.yaml diff --git a/hieradata/clusters/ganeti2.debian.org.yaml b/hieradata/clusters/ganeti2.debian.org.yaml deleted file mode 100644 index 778939a86..000000000 --- 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 92dd5c1e5..f13ee1a9c 100644 --- 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 -- 2.20.1