From e328df2ba76628ae23f3fcdee476d6bb0ec8177f Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 5 Sep 2013 18:09:25 +0200 Subject: Some packages are installed before refresh_apt is called (Bug #2988) --- puppet/modules/site_apt/manifests/init.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'puppet/modules/site_apt/manifests/init.pp') diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 8821c110..3fa9a2b7 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -37,6 +37,6 @@ class site_apt { # The creation of sources.list depends on the lsb package File['/etc/apt/preferences'] -> - Exec['refresh_apt'] - Package <| ( title != 'lsb' ) |> + Exec['refresh_apt'] -> + Package <| ( title != 'lsb' ) |> } -- cgit v1.2.3 From 6381342712085fc5c147f21b13872d0c49c42855 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 16 Oct 2013 20:48:21 +0200 Subject: /etc/apt/preferences is changed twice on every puppetrun on couch nodes (Feature #3962) this will fix the alteration of the preferences file. we now use the apt module default preferences, and pin the depending packages from squeeze that are dependencies for the bigcouch package in the couchdb module, class couchdb::bigcouch::package::cloudant. --- puppet/modules/site_apt/manifests/init.pp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'puppet/modules/site_apt/manifests/init.pp') diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 3fa9a2b7..9facf4cc 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -1,15 +1,6 @@ class site_apt { - # on couchdb we need to include squeeze in apt preferences, - # so the cloudant package can pull some packages from squeeze - # template() must be unquoted ! - if 'couchdb' in $::services { - $custom_preferences = template("site_apt/preferences.include_squeeze") - } else { - $custom_preferences = '' - } class { 'apt': - custom_preferences => $custom_preferences, custom_key_dir => 'puppet:///modules/site_apt/keys' } -- cgit v1.2.3