diff options
author | Micah Anderson <micah@riseup.net> | 2011-03-22 12:20:35 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2011-03-22 12:21:04 -0400 |
commit | 898a1f9c8fdf7843cad890ec3ee7fd655654e8d6 (patch) | |
tree | b1559e43c34b5a146b36c6212ee2bf57f77e8571 | |
parent | a23b97a2ea3b09c27999ee7b50941c7c5482940d (diff) |
add debian-specific puppetmaster require parameter package override
-rw-r--r-- | manifests/debian.pp | 4 | ||||
-rw-r--r-- | manifests/puppetmaster/package.pp | 1 | ||||
-rw-r--r-- | manifests/puppetmaster/package/debian.pp | 6 |
3 files changed, 11 insertions, 0 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index 690c7c5..90e8327 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -26,6 +26,10 @@ class puppet::debian inherits puppet::linux { package{ 'puppet-common': ensure => $puppet_ensure_version, } + + Package['puppet']{ + require => Package['puppet-common']; + } } diff --git a/manifests/puppetmaster/package.pp b/manifests/puppetmaster/package.pp index 4be146d..145792e 100644 --- a/manifests/puppetmaster/package.pp +++ b/manifests/puppetmaster/package.pp @@ -3,6 +3,7 @@ class puppet::puppetmaster::package inherits puppet::puppetmaster::linux { case $operatingsystem { centos: { include puppet::puppetmaster::package::centos } + debian: { include puppet::puppetmaster::package::debian } default: { include puppet::puppetmaster::package::base } } } diff --git a/manifests/puppetmaster/package/debian.pp b/manifests/puppetmaster/package/debian.pp new file mode 100644 index 0000000..254d55f --- /dev/null +++ b/manifests/puppetmaster/package/debian.pp @@ -0,0 +1,6 @@ +class puppet::puppetmaster::package::debian inherits puppet::puppetmaster::package { + + Package['puppetmaster']{ + require => Package['puppetmaster-common']; + } +} |