expand hiera data and add cluster info to motd

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

diff --git a/modules/debian-org/lib/facter/cluster.rb b/modules/debian-org/lib/facter/cluster.rb
index 6b083a4..3588868 100644 (file)
--- a/modules/debian-org/lib/facter/cluster.rb
+++ b/modules/debian-org/lib/facter/cluster.rb
@@ -1,6 +1,6 @@
 Facter.add('cluster') do
   setcode do
-    if system('/usr/sbin/gnt-cluster getmaster')
+    if system('/usr/sbin/gnt-cluster getmaster >/dev/null')
       require 'json'
       config = '/var/lib/ganeti/config.data'
       if FileTest.exist?(config)

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 6beeadd..8844871 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -100,9 +100,23 @@ unless vms.empty?
 end
 
 
+if hiera('cluster')
+  purp += "\nganeti cluster: " + hiera('cluster') + " contains these nodes:\n"
+  hiera_array('nodes').each do |node|
+    purp += "\t" + node
+    if node.eql?(fqdn)
+      purp += " (this system)"
+    end
+    purp += "\n"
+  end
+  purp += "\n"
+end
+
+
 if scope.lookupvar('site::nodeinfo').has_key?('footer')
   purp += "\n" + wrap(scope.lookupvar('site::nodeinfo')['footer']) + "\n"
 end
+
 purp
 -%>
 

diff --git a/modules/puppetmaster/files/hiera.yaml b/modules/puppetmaster/files/hiera.yaml
index 98411f6..54fab8b 100644 (file)
--- a/modules/puppetmaster/files/hiera.yaml
+++ b/modules/puppetmaster/files/hiera.yaml
@@ -1,6 +1,7 @@
 ---
 :hierarchy:
   - %{hoster}
+  - clusters/%{cluster}
   - common
 :backends:
   - yaml