diff options
author | mh <mh@immerda.ch> | 2008-10-01 22:27:30 +0000 |
---|---|---|
committer | mh <mh@immerda.ch> | 2008-10-01 22:27:30 +0000 |
commit | 9ca92ecfefb3bee983b232a826860a07e1d3cc4c (patch) | |
tree | 5f791488487eae6b3bcb977fea29e42c956dc7b6 /manifests/puppetmaster | |
parent | 65b33409f0da0a5769e9951685c567f990da41d2 (diff) |
corrected inheritance order
Diffstat (limited to 'manifests/puppetmaster')
-rw-r--r-- | manifests/puppetmaster/cluster.pp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/manifests/puppetmaster/cluster.pp b/manifests/puppetmaster/cluster.pp index 0a1667e..081a290 100644 --- a/manifests/puppetmaster/cluster.pp +++ b/manifests/puppetmaster/cluster.pp @@ -1,11 +1,7 @@ # manifests/puppetmaster/cluster.pp class puppet::puppetmaster::cluster inherits puppet::puppetmaster { - include mongrel, nginx - - File[puppet_config] { - require +> [ Package[mongrel], Package[nginx], File[nginx_config] ], - } + include puppet::puppetmaster::cluster::base case $operatingsystem { gentoo, centos: { @@ -16,3 +12,11 @@ class puppet::puppetmaster::cluster inherits puppet::puppetmaster { } } } + +class puppet::puppetmaster::cluster::base inherits puppet::puppetmaster::base { + include mongrel, nginx + + File[puppet_config] { + require +> [ Package[mongrel], Package[nginx], File[nginx_config] ], + } +} |