summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-07-16 14:21:26 -0400
committerMicah Anderson <micah@riseup.net>2012-07-16 14:21:26 -0400
commit392db0c4e46f77c88f551215cd00719bc7c45b24 (patch)
tree7a2968b802af016eeba6411d01cfd227296b1acd /manifests
parent2a83aea970a8348fedeee2109d6d530a7e73a39b (diff)
add apt::preferences::snippet to enable specifying the puppetmaster version.
The preferences snippet requires that we set the package parameter to 'puppet*' to pull in the correct dependencies. We set the priority to 2000 because according to apt_preferences(5): P > 1000 causes a version to be installed even if this constitutes a downgrade of the package which is the desired behavior. This should resolve issue #2928
Diffstat (limited to 'manifests')
-rw-r--r--manifests/puppetmaster/package/debian.pp12
1 files changed, 10 insertions, 2 deletions
diff --git a/manifests/puppetmaster/package/debian.pp b/manifests/puppetmaster/package/debian.pp
index 01b7f79..eca55e9 100644
--- a/manifests/puppetmaster/package/debian.pp
+++ b/manifests/puppetmaster/package/debian.pp
@@ -15,6 +15,14 @@ class puppet::puppetmaster::package::debian inherits puppet::puppetmaster::packa
}
}
}
+ else {
+ apt::preferences_snippet {
+ 'puppet_passenger':
+ package => 'puppet*',
+ pin => "version $puppetmaster_ensure_version",
+ priority => 2000;
+ }
+ }
Package["puppetmaster"]{
require => $puppetmaster_common_required ? {
@@ -23,11 +31,11 @@ class puppet::puppetmaster::package::debian inherits puppet::puppetmaster::packa
},
ensure => $puppetmaster_ensure_version,
}
-
+
package { "puppetmaster-common":
ensure => $puppetmaster_common_required ? {
'' => absent,
- default => $puppetmaster_common_ensure
+ default => installed
},
}
}