From 392db0c4e46f77c88f551215cd00719bc7c45b24 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 16 Jul 2012 14:21:26 -0400 Subject: 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 --- manifests/puppetmaster/package/debian.pp | 12 ++++++++++-- 1 file 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 }, } } -- cgit v1.2.3