diff options
| author | varac <varacanero@zeromail.org> | 2016-03-10 21:12:11 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-03-10 21:12:11 +0100 |
| commit | 65335becbf8602b65ed385090400088f56293d9b (patch) | |
| tree | 7b455dfc73dcf3c58d54a78f716ab56c3150a992 /puppet/modules/soledad | |
| parent | aa2c2590e7b976805402c4c0a2ebe4b554304a85 (diff) | |
[jessie] Remove obsolete backports pinning
Diffstat (limited to 'puppet/modules/soledad')
| -rw-r--r-- | puppet/modules/soledad/manifests/client.pp | 4 | ||||
| -rw-r--r-- | puppet/modules/soledad/manifests/common.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/soledad/manifests/server.pp | 5 |
3 files changed, 2 insertions, 9 deletions
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': |