summaryrefslogtreecommitdiff
path: root/puppet/modules/site_couchdb
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-01-21 16:28:16 +0100
committervarac <varacanero@zeromail.org>2014-01-21 16:28:16 +0100
commit95a39e935ecd6c3cd3b1c79466798d384ab2cdbf (patch)
treeef6114d92ce9e6609e63e530dd67aa688812ea78 /puppet/modules/site_couchdb
parentdfc1368452a6474cb4582aff0f3505a2b8b4842c (diff)
parente91d7e016244da48be0a9ea23d3bb43bb3b8e93d (diff)
Merge branch 'feature/4971_install_leap_bigcouch_package' into develop
Diffstat (limited to 'puppet/modules/site_couchdb')
-rw-r--r--puppet/modules/site_couchdb/manifests/init.pp7
1 files changed, 6 insertions, 1 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index ad0c996a..4cd7ce03 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -49,7 +49,12 @@ class site_couchdb {
ednp_port => $ednp_port
}
- class { 'couchdb::bigcouch::package::cloudant': }
+ # ensure that we don't have leftovers from previous installations
+ # where we installed the cloudant bigcouch package
+ # https://leap.se/code/issues/4971
+ class { 'couchdb::bigcouch::package::cloudant':
+ ensure => absent
+ }
Class['site_config::default']
-> Class['couchdb::bigcouch::package::cloudant']