summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-07-16 15:09:04 -0400
committerMicah Anderson <micah@riseup.net>2012-07-16 15:09:04 -0400
commit25c8e401004e15fbb15faa5dec7f6bb62aee0e8a (patch)
tree8a46f170f75376f27f43af27fff8302dedbd25c6 /manifests
parentf1a6bc15299fd07022805eb941112495bc64c5e4 (diff)
remove the complicated test case for determining if 'puppetmaster-common' is needed or not, this is handled by the apt::preferences_snippet and debian's package dependency resolution now
stop inheriting puppet::master::package::base from puppet::puppetmaster::package::debian, it is no longer needed, because we are no longer overriding anything
Diffstat (limited to 'manifests')
-rw-r--r--manifests/puppetmaster/package/debian.pp48
1 files changed, 10 insertions, 38 deletions
diff --git a/manifests/puppetmaster/package/debian.pp b/manifests/puppetmaster/package/debian.pp
index eca55e9..cea7ac4 100644
--- a/manifests/puppetmaster/package/debian.pp
+++ b/manifests/puppetmaster/package/debian.pp
@@ -1,41 +1,13 @@
-class puppet::puppetmaster::package::debian inherits puppet::puppetmaster::package::base {
+class puppet::puppetmaster::package::debian {
- if !$puppetmaster_ensure_version {
- $puppetmaster_ensure_version = 'installed'
- case $lsbdistcodename {
- wheezy,sid: {
- $puppetmaster_common_required = 'puppetmaster-common'
- $puppetmaster_common_ensure = $puppetmaster_ensure_version
- }
- default: {
- if (versioncmp($puppetmaster_ensure_version, "2.6.7") >= 0) {
- $puppetmaster_common_requred = 'puppetmaster-common'
- $puppetmaster_common_ensure = $puppetmaster_ensure_version
- }
- }
- }
- }
- else {
- apt::preferences_snippet {
- 'puppet_passenger':
- package => 'puppet*',
- pin => "version $puppetmaster_ensure_version",
- priority => 2000;
- }
- }
-
- Package["puppetmaster"]{
- require => $puppetmaster_common_required ? {
- '' => undef,
- default => Package["$puppetmaster_common_required"]
- },
- ensure => $puppetmaster_ensure_version,
- }
-
- package { "puppetmaster-common":
- ensure => $puppetmaster_common_required ? {
- '' => absent,
- default => installed
- },
+ include puppet::puppetmaster::package::base
+
+ apt::preferences_snippet {
+ 'puppet_passenger':
+ package => 'puppet*',
+ pin => "version $puppetmaster_ensure_version",
+ priority => 2000,
+ notify => Exec['refresh_apt'],
+ before => Package['puppetmaster'];
}
}