projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
helps to put code in correct block
[mirror/dsa-puppet.git]
/
modules
/
motd
/
templates
/
motd.erb
diff --git
a/modules/motd/templates/motd.erb
b/modules/motd/templates/motd.erb
index
29326b4
..
47e4531
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-18,40
+18,42
@@
def markup(l)
end
purp = ''
end
purp = ''
-if
nodeinfo
.has_key?('nameinfo')
- purp += wrap(
nodeinfo
['nameinfo']) + "\n\n"
+if
scope.lookupvar('site::nodeinfo')
.has_key?('nameinfo')
+ purp += wrap(
scope.lookupvar('site::nodeinfo')
['nameinfo']) + "\n\n"
end
end
+ninfo = scope.lookupvar('site::nodeinfo')
+
purp += 'Welcome to ' + fqdn
purp += 'Welcome to ' + fqdn
-if (
nodeinfo
['ldap'].has_key?('purpose'))
- p =
nodeinfo
['ldap']['purpose'].clone()
+if (
scope.lookupvar('site::nodeinfo')
['ldap'].has_key?('purpose'))
+ p =
scope.lookupvar('site::nodeinfo')
['ldap']['purpose'].clone()
extra = ''
if p.delete('buildd')
purp += ", the Debian "
extra = ''
if p.delete('buildd')
purp += ", the Debian "
- if
nodeinfo
['ldap'].has_key?('architecture')
- purp +=
nodeinfo
['ldap']['architecture'][0]
+ if
scope.lookupvar('site::nodeinfo')
['ldap'].has_key?('architecture')
+ purp +=
scope.lookupvar('site::nodeinfo')
['ldap']['architecture'][0]
end
end
- purp += " build daemon
\n
"
+ purp += " build daemon"
end
if p.delete('porterbox')
purp += ", the Debian "
end
if p.delete('porterbox')
purp += ", the Debian "
- if
nodeinfo
['ldap'].has_key?('architecture')
- purp +=
nodeinfo
['ldap']['architecture'][0]
+ if
scope.lookupvar('site::nodeinfo')
['ldap'].has_key?('architecture')
+ purp +=
scope.lookupvar('site::nodeinfo')
['ldap']['architecture'][0]
end
end
- purp += " porterbox
\n
"
+ purp += " porterbox"
extra += "\n"
extra += "See 'dchroot -l' or 'schroot -l' for a list of available chroots.\n"
extra += "\n"
extra += "See 'dchroot -l' or 'schroot -l' for a list of available chroots.\n"
- if
nodeinfo
['ldap'].has_key?('admin')
- extra += "Please contact #{n
ode
info['ldap']['admin'][0]} for install requests,\n"
+ if
scope.lookupvar('site::nodeinfo')
['ldap'].has_key?('admin')
+ extra += "Please contact #{ninfo['ldap']['admin'][0]} for install requests,\n"
extra += "following the recommendations in <URL:http://dsa.debian.org/doc/install-req/>.\n"
end
end
if p.size() > 0
purp += ", used for the following services:\n"
extra += "following the recommendations in <URL:http://dsa.debian.org/doc/install-req/>.\n"
end
end
if p.size() > 0
purp += ", used for the following services:\n"
-
nodeinfo
['ldap']['purpose'].sort.each do |l|
+
scope.lookupvar('site::nodeinfo')
['ldap']['purpose'].sort.each do |l|
l = markup(l)
purp += "\t" + l + "\n"
end
l = markup(l)
purp += "\t" + l + "\n"
end
@@
-64,18
+66,20
@@
else
purp += ".\n"
end
purp += ".\n"
end
-if (nodeinfo['ldap'].has_key?('physicalHost'))
- purp += wrap("This virtual server runs on the physical host #{nodeinfo['ldap']['physicalHost'][0]}." +
- "It is hosted at #{nodeinfo['hoster']['longname']}."
+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]}, " +
+ "which is hosted at #{ninfo['hoster']['longname']}."
)
)
-elsif
nodeinfo
['hoster']['name']
- purp += wrap("This server is hosted at #{n
ode
info['hoster']['longname']}.")
+elsif
scope.lookupvar('site::nodeinfo')
['hoster']['name']
+ purp += wrap("This server is hosted at #{ninfo['hoster']['longname']}.")
end
vms = []
end
vms = []
-
allnodeinfo
.keys.sort.each do |node|
- if
allnodeinfo[node]['physicalHost'] and allnodeinfo
[node]['physicalHost'].include?(fqdn)
+
scope.lookupvar('site::allnodeinfo')
.keys.sort.each do |node|
+ if
scope.lookupvar('site::allnodeinfo')[node]['physicalHost'] and scope.lookupvar('site::allnodeinfo')
[node]['physicalHost'].include?(fqdn)
vms << node
end
end
vms << node
end
end
@@
-83,9
+87,9
@@
unless vms.empty?
purp += "\nThe following virtual machines run on this system:\n"
vms.each do |node|
purp += "\t- #{node}"
purp += "\nThe following virtual machines run on this system:\n"
vms.each do |node|
purp += "\t- #{node}"
- if
allnodeinfo
[node]['purpose']
+ if
scope.lookupvar('site::allnodeinfo')
[node]['purpose']
purp += ":\n"
purp += ":\n"
-
allnodeinfo
[node]['purpose'].sort.each do |l|
+
scope.lookupvar('site::allnodeinfo')
[node]['purpose'].sort.each do |l|
l = markup(l)
purp += "\t " + l + "\n"
end
l = markup(l)
purp += "\t " + l + "\n"
end
@@
-96,9
+100,19
@@
unless vms.empty?
end
end
-if nodeinfo.has_key?('footer')
- purp += "\n" + wrap(nodeinfo['footer']) + "\n"
+if scope.lookupvar('::cluster')
+ purp += "\nThis server is a node in ganeti cluster: "
+ purp += scope.lookupvar('::cluster') + ".\n"
+ scope.hiera_array('nodes').each do |node|
+ purp += "\t" + node + "\n"
+ end
end
end
+
+
+if scope.lookupvar('site::nodeinfo').has_key?('footer')
+ purp += "\n" + wrap(scope.lookupvar('site::nodeinfo')['footer']) + "\n"
+end
+
purp
-%>
purp
-%>