projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to use getfromhash instead of extractnodeinfo
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
e0f2ef4
..
08e5fec
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-43,7
+43,7
@@
node default {
case $kvmdomain {
"true": {
package { acpid: ensure => installed }
case $kvmdomain {
"true": {
package { acpid: ensure => installed }
- case
extractnodeinfo
($nodeinfo, 'squeeze') {
+ case
getfromhash
($nodeinfo, 'squeeze') {
true: { package { acpi-support-base: ensure => installed } }
}
}
true: { package { acpi-support-base: ensure => installed } }
}
}
@@
-54,32
+54,32
@@
node default {
case $mta {
"exim4": {
case $mta {
"exim4": {
- case
extractnodeinfo
($nodeinfo, 'heavy_exim') {
+ case
getfromhash
($nodeinfo, 'heavy_exim') {
true: { include exim::mx }
default: { include exim }
}
}
}
true: { include exim::mx }
default: { include exim }
}
}
}
- case
extractnodeinfo
($nodeinfo, 'puppetmaster') {
+ case
getfromhash
($nodeinfo, 'puppetmaster') {
true: { include puppetmaster }
}
true: { include puppetmaster }
}
- case
extractnodeinfo
($nodeinfo, 'muninmaster') {
+ case
getfromhash
($nodeinfo, 'muninmaster') {
true: { include munin-node::master }
}
true: { include munin-node::master }
}
- case
extractnodeinfo
($nodeinfo, 'nagiosmaster') {
+ case
getfromhash
($nodeinfo, 'nagiosmaster') {
true: { include nagios::server }
default: { include nagios::client }
}
case $apache2 {
"true": {
true: { include nagios::server }
default: { include nagios::client }
}
case $apache2 {
"true": {
- case
extractnodeinfo
($nodeinfo, 'apache2_security_mirror') {
+ case
getfromhash
($nodeinfo, 'apache2_security_mirror') {
true: { include apache2::security_mirror }
}
true: { include apache2::security_mirror }
}
- case
extractnodeinfo
($nodeinfo, 'apache2_www_mirror') {
+ case
getfromhash
($nodeinfo, 'apache2_www_mirror') {
true: { include apache2::www_mirror }
}
include apache2
true: { include apache2::www_mirror }
}
include apache2
@@
-91,7
+91,7
@@
node default {
}
}
- case
extractnodeinfo
($nodeinfo, 'buildd') {
+ case
getfromhash
($nodeinfo, 'buildd') {
true: {
include buildd
}
true: {
include buildd
}