From 65335becbf8602b65ed385090400088f56293d9b Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 10 Mar 2016 21:12:11 +0100
Subject: [jessie] Remove obsolete backports pinning

---
 puppet/modules/soledad/manifests/client.pp | 4 +---
 puppet/modules/soledad/manifests/common.pp | 2 --
 puppet/modules/soledad/manifests/server.pp | 5 +----
 3 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'puppet/modules/soledad/manifests')

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':
-- 
cgit v1.2.3