/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.

1 files changed, 0 insertions, 9 deletions

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'
   }