Merge branch '7716_remove_obsolete_backports_pinning' into develop

12 files changed, 8 insertions, 50 deletions

diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index 6bdcec42..6dfee44d 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -10,7 +10,6 @@ class leap_mx {
   $sources          = hiera('sources')
 
   include soledad::common
-  include site_apt::preferences::twisted
 
   #
   # USER AND GROUP
@@ -98,7 +97,6 @@ class leap_mx {
     $sources['leap-mx']['package']:
       ensure  => $sources['leap-mx']['revision'],
       require => [
-        Class['site_apt::preferences::twisted'],
         Class['site_apt::leap_repo'],
         User['leap-mx'] ];
 
diff --git a/puppet/modules/obfsproxy/manifests/init.pp b/puppet/modules/obfsproxy/manifests/init.pp
index 61714fdf..5c78560a 100644
--- a/puppet/modules/obfsproxy/manifests/init.pp
+++ b/puppet/modules/obfsproxy/manifests/init.pp
@@ -67,8 +67,7 @@ class obfsproxy (
   }
 
   package { 'obfsproxy':
-    ensure  => present,
-    require => Class['site_apt::preferences::obfsproxy'],
+    ensure  => present
   }
 
   service { 'obfsproxy':
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index d6fe0e72..455425c1 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -42,11 +42,6 @@ class site_apt {
   #  content => template('site_apt/secondary.list');
   #}
 
-  apt::preferences_snippet { 'facter':
-    release  => "${::lsbdistcodename}-backports",
-    priority => 999
-  }
-
   apt::preferences_snippet { 'leap':
     priority => 999,
     package  => '*',
diff --git a/puppet/modules/site_apt/manifests/preferences/obfsproxy.pp b/puppet/modules/site_apt/manifests/preferences/obfsproxy.pp
deleted file mode 100644
index 75b01956..00000000
--- a/puppet/modules/site_apt/manifests/preferences/obfsproxy.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class site_apt::preferences::obfsproxy {
-
-  apt::preferences_snippet { 'obfsproxy':
-    package  => 'obfsproxy',
-    release  => 'wheezy-backports',
-    priority => 999;
-  }
-
-}
diff --git a/puppet/modules/site_apt/manifests/preferences/twisted.pp b/puppet/modules/site_apt/manifests/preferences/twisted.pp
deleted file mode 100644
index abff6838..00000000
--- a/puppet/modules/site_apt/manifests/preferences/twisted.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class site_apt::preferences::twisted {
-
-  apt::preferences_snippet { 'python-twisted':
-    package  => 'python-twisted*',
-    release  => "${::lsbdistcodename}-backports",
-    priority => 999;
-  }
-
-}
diff --git a/puppet/modules/site_apt/manifests/preferences/unbound.pp b/puppet/modules/site_apt/manifests/preferences/unbound.pp
deleted file mode 100644
index 6da964f9..00000000
--- a/puppet/modules/site_apt/manifests/preferences/unbound.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-class site_apt::preferences::unbound {
-
-  apt::preferences_snippet { 'unbound':
-    package  => 'libunbound* unbound*',
-    release  => "${::lsbdistcodename}-backports",
-    priority => 999,
-    before   => Class['unbound::package'];
-  }
-
-}
diff --git a/puppet/modules/site_config/manifests/caching_resolver.pp b/puppet/modules/site_config/manifests/caching_resolver.pp
index cdebbad0..50824fdd 100644
--- a/puppet/modules/site_config/manifests/caching_resolver.pp
+++ b/puppet/modules/site_config/manifests/caching_resolver.pp
@@ -1,8 +1,6 @@
 class site_config::caching_resolver {
   tag 'leap_base'
 
-  include site_apt::preferences::unbound
-
   class { 'unbound':
     root_hints => false,
     anchor     => false,
diff --git a/puppet/modules/site_config/manifests/remove/jessie.pp b/puppet/modules/site_config/manifests/remove/jessie.pp
index c813e46d..e9497baf 100644
--- a/puppet/modules/site_config/manifests/remove/jessie.pp
+++ b/puppet/modules/site_config/manifests/remove/jessie.pp
@@ -6,4 +6,9 @@ class site_config::remove::jessie {
       notify => Exec['apt_updated'];
   }
 
+  apt::preferences_snippet {
+    [ 'facter', 'obfsproxy', 'python-twisted', 'unbound' ]:
+      ensure => absent;
+  }
+
 }
diff --git a/puppet/modules/site_obfsproxy/manifests/init.pp b/puppet/modules/site_obfsproxy/manifests/init.pp
index b622588b..2ed5ec9e 100644
--- a/puppet/modules/site_obfsproxy/manifests/init.pp
+++ b/puppet/modules/site_obfsproxy/manifests/init.pp
@@ -20,8 +20,6 @@ class site_obfsproxy {
   }
 
   include site_config::default
-  include site_apt::preferences::twisted
-  include site_apt::preferences::obfsproxy
 
   class { 'obfsproxy':
     transport    => $transport,
diff --git a/puppet/modules/soledad/manifests/client.pp b/puppet/modules/soledad/manifests/client.pp
index 5700cb09..e470adeb 100644
--- a/puppet/modules/soledad/manifests/client.pp
+++ b/puppet/modules/soledad/manifests/client.pp
@@ -8,9 +8,7 @@ class soledad::client {
   package {
     'soledad-client':
       ensure  => latest,
-      require => [
-        Class['site_apt::preferences::twisted'],
-        Class['site_apt::leap_repo'] ];
+      require => Class['site_apt::leap_repo'];
     'python-u1db':
       ensure => latest;
   }
diff --git a/puppet/modules/soledad/manifests/common.pp b/puppet/modules/soledad/manifests/common.pp
index d66e943c..8d8339d4 100644
--- a/puppet/modules/soledad/manifests/common.pp
+++ b/puppet/modules/soledad/manifests/common.pp
@@ -1,8 +1,6 @@
 # install soledad-common, both needed both soledad-client and soledad-server
 class soledad::common {
 
-  include site_apt::preferences::twisted
-
   package { 'soledad-common':
     ensure  => latest;
   }
diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index f46c1eff..8674f421 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -4,7 +4,6 @@ class soledad::server {
 
   include site_config::default
   include soledad::common
-  include site_apt::preferences::twisted
 
   $soledad              = hiera('soledad')
   $couchdb_user         = $soledad['couchdb_soledad_user']['username']
@@ -53,9 +52,7 @@ class soledad::server {
 
   package { $sources['soledad']['package']:
     ensure  => $sources['soledad']['revision'],
-    require => [
-      Class['site_apt::preferences::twisted'],
-      Class['site_apt::leap_repo'] ];
+    require => Class['site_apt::leap_repo'];
   }
 
   file { '/etc/default/soledad':