summaryrefslogtreecommitdiff
path: root/puppet/modules/soledad
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-03-14 14:40:24 +0100
committervarac <varacanero@zeromail.org>2016-03-14 14:40:24 +0100
commit5f5f7255bb060b21b38f698b8a47e9bc89ec665e (patch)
treec274ba4f065a409e357ae209c49a457f2f0ab466 /puppet/modules/soledad
parent4183a10168c61366448e39cf4db45eebc741a27e (diff)
parent65335becbf8602b65ed385090400088f56293d9b (diff)
Merge branch '7716_remove_obsolete_backports_pinning' into develop
Diffstat (limited to 'puppet/modules/soledad')
-rw-r--r--puppet/modules/soledad/manifests/client.pp4
-rw-r--r--puppet/modules/soledad/manifests/common.pp2
-rw-r--r--puppet/modules/soledad/manifests/server.pp5
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':