projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
2e8000b
..
a88b728
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-55,11
+55,10
@@
node default {
default: { }
}
default: { }
}
- case $hostname {
- ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer:
- { include buildd }
- default: {}
- }
+ case extractnodeinfo($nodeinfo, 'buildd') {
+ "true": { include buildd }
+ default: { }
+ }
# maybe wait for rietz to be upgraded to lenny
# case $hostname {
# maybe wait for rietz to be upgraded to lenny
# case $hostname {
@@
-73,8
+72,8
@@
node default {
{ include geodns }
default: {}
}
{ include geodns }
default: {}
}
-}
-
-node penalosa inherits default {
- include hosts
+ case $brokenhosts {
+ "true": { include hosts }
+ default: {}
+ }
}
}