diff options
| author | Micah Anderson <micah@riseup.net> | 2012-07-16 15:10:26 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-07-16 15:10:26 -0400 |
| commit | e761d31212a340a4c54f76d6308c42f569d4046d (patch) | |
| tree | 3427149131fad936458d835ac6a37cb6e441b9ea /manifests | |
| parent | 25c8e401004e15fbb15faa5dec7f6bb62aee0e8a (diff) | |
remove no longer needed inheritance of puppet::puppetmaster::package as we are not doing any overrides, instead we can just include the classes that we also want to load
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/puppetmaster/debian.pp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp index 0c81a64..f440ba3 100644 --- a/manifests/puppetmaster/debian.pp +++ b/manifests/puppetmaster/debian.pp @@ -1,5 +1,8 @@ -class puppet::puppetmaster::debian inherits puppet::puppetmaster::package { +class puppet::puppetmaster::debian { + include puppet::puppetmaster::package + include puppet::puppetmaster::linux + if $puppetmaster_mode != 'passenger' { case $lsbdistcodename { squeeze,sid: { |