summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2008-07-02 20:36:04 +0000
committermh <mh@immerda.ch>2008-07-02 20:36:04 +0000
commitaded65d73ce095cd1d047992ef6631c6b30f824b (patch)
treed152abdee1b7b9f2ec803ac8dad9e41c45de67f1
parent47b1850555111378d61640a12f22aa4331e2c51a (diff)
grr double sublclassing is hacky, but currently don't see no other way to implemented this dependency
-rw-r--r--manifests/puppetmaster/cluster.pp14
1 files changed, 12 insertions, 2 deletions
diff --git a/manifests/puppetmaster/cluster.pp b/manifests/puppetmaster/cluster.pp
index 826737a..36094ce 100644
--- a/manifests/puppetmaster/cluster.pp
+++ b/manifests/puppetmaster/cluster.pp
@@ -3,10 +3,16 @@
class puppet::puppetmaster::cluster inherits puppet::puppetmaster {
include mongrel, nginx
- case $kernel {
- linux: { include puppet::puppetmaster::linux::cluster }
+ case $operatingsystem {
+ centos,debian, redhat: { include puppet::puppetmaster::package::cluster }
+ default: {
+ case $kernel {
+ linux: { include puppet::puppetmaster::linux::cluster }
+ }
+ }
}
+
File[puppet_config] {
require +> [ Package[mongrel], Package[nginx], File[nginx_config] ],
}
@@ -25,4 +31,8 @@ class puppet::puppetmaster::linux::cluster inherits puppet::puppetmaster::linux
Service[puppetmaster]{
require +> Service[ngnix],
}
+class puppet::puppetmaster::package::cluster inherits puppet::puppetmaster::package {
+ Service[puppetmaster]{
+ require +> Service[ngnix],
+ }
}