From: Stephen Gran <steve@lobefin.net>
Date: Sun, 30 Sep 2012 16:28:46 +0000 (+0100)
Subject: make motd a little nicer
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a9fd38a43f8d880801afa6533184e437725049e8;p=mirror%2Fdsa-puppet.git

make motd a little nicer

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 2430bb1dd..e18d58ce3 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -69,7 +69,12 @@ end
 purp += "\n"
 
 if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('physicalHost'))
-  purp += wrap("This virtual server runs on the physical host #{ninfo['ldap']['physicalHost'][0]}, " +
+  if ninfo['ldap']['physicalHost'][0] =~ /ganeti/
+    phys_host = 'cluster'
+  else
+    phys_host = 'physical host'
+  end
+  purp += wrap("This virtual server runs on the #{phys_host} #{ninfo['ldap']['physicalHost'][0]}, " +
                "which is hosted at #{ninfo['hoster']['longname']}."
                )
 elsif scope.lookupvar('site::nodeinfo')['hoster']['name']