projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spacing
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
c843705
..
c518cd6
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-41,7
+41,12
@@
node default {
"true": { include debian-proliant }
}
case $kvmdomain {
"true": { include debian-proliant }
}
case $kvmdomain {
- "true": { package { acpid: ensure => installed } }
+ "true": {
+ package { acpid: ensure => installed }
+ case extractnodeinfo($nodeinfo, 'squeeze') {
+ 'true': { package { acpi-support-base: ensure => installed } }
+ }
+ }
}
case $mptraid {
"true": { include "raidmpt" }
}
case $mptraid {
"true": { include "raidmpt" }
@@
-83,7
+88,7
@@
node default {
case $hostname {
klecker,ravel,senfl,orff,draghi: { include named::authoritative }
geo1,geo2,geo3: { include named::geodns }
case $hostname {
klecker,ravel,senfl,orff,draghi: { include named::authoritative }
geo1,geo2,geo3: { include named::geodns }
- bartok,franck,liszt,master,samosa,schein,spohr,steffani: { include named::recursor }
+ bartok,franck,liszt,master,samosa,schein,spohr,steffani
,widor
: { include named::recursor }
}
case $kernel {
}
case $kernel {
@@
-94,7
+99,7
@@
node default {
}
case $hostname {
}
case $hostname {
- beethoven,ravel,spohr: {
+ beethoven,ravel,spohr
,stabile
: {
include nfs-server
}
}
include nfs-server
}
}
@@
-115,11
+120,11
@@
node default {
byrd,schuetz: {
include krb
}
byrd,schuetz: {
include krb
}
- bartok,draghi: {
+ bartok,draghi
,quantz,samosa
: {
include krb
include afs
}
include krb
include afs
}
- lamb,locke,rautavaara: {
+ lamb,locke,rautavaara
,rietz
: {
include krb
include afs::server
}
include krb
include afs::server
}