diff options
| author | mh <mh@immerda.ch> | 2008-10-01 22:25:38 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2008-10-01 22:25:38 +0000 |
| commit | 65b33409f0da0a5769e9951685c567f990da41d2 (patch) | |
| tree | c982aadd4db8ceaea780ae973afefd8a78694271 /manifests | |
| parent | 4ba6f5a2dfa748f3c6a7de62e616e1bfc2059903 (diff) | |
corrected inheritance order
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/puppetmaster.pp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp index fa975ad..7e80792 100644 --- a/manifests/puppetmaster.pp +++ b/manifests/puppetmaster.pp @@ -12,6 +12,10 @@ class puppet::puppetmaster inherits puppet { } } } + include puppet::puppetmaster::base +} + +class puppet::puppetmaster::base inherits puppet::base { File[puppet_config]{ source => [ "puppet://$server/files/puppet/master/puppet.conf", @@ -44,6 +48,7 @@ class puppet::puppetmaster inherits puppet { } } + define puppet::puppetmaster::hasdb( $dbtype = 'mysql', $dbname = 'puppet', |