summaryrefslogtreecommitdiff
path: root/puppet/modules/site_couchdb
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-12-20 10:12:39 -0800
committerelijah <elijah@riseup.net>2017-01-08 11:59:09 -0800
commit21b4bd1fd1e875716b09572006d309221772a43c (patch)
treea469211e2f62bc3ec40dac93ae34b5417e1e2c47 /puppet/modules/site_couchdb
parent5821964ff7e16ca7aa9141bd09a77d355db492a9 (diff)
bugfix: couchdb nodes should not require soledad. closes #8693
Diffstat (limited to 'puppet/modules/site_couchdb')
-rw-r--r--puppet/modules/site_couchdb/manifests/create_dbs.pp11
1 files changed, 7 insertions, 4 deletions
diff --git a/puppet/modules/site_couchdb/manifests/create_dbs.pp b/puppet/modules/site_couchdb/manifests/create_dbs.pp
index ddfb7d65..1c594bb6 100644
--- a/puppet/modules/site_couchdb/manifests/create_dbs.pp
+++ b/puppet/modules/site_couchdb/manifests/create_dbs.pp
@@ -1,5 +1,6 @@
# creates neccesary databases
class site_couchdb::create_dbs {
+ $services = hiera('services', [])
Class['site_couchdb::setup']
-> Class['site_couchdb::create_dbs']
@@ -42,10 +43,12 @@ class site_couchdb::create_dbs {
## shared database
## r/w: soledad
- couchdb::create_db { 'shared':
- members => "{ \"names\": [\"${site_couchdb::couchdb_soledad_user}\"], \"roles\": [\"replication\"] }",
- require => Couchdb::Query::Setup['localhost'],
- notify => Service['soledad-server'];
+ if member($services, 'soledad') {
+ couchdb::create_db { 'shared':
+ members => "{ \"names\": [\"${site_couchdb::couchdb_soledad_user}\"], \"roles\": [\"replication\"] }",
+ require => Couchdb::Query::Setup['localhost'],
+ notify => Service['soledad-server'];
+ }
}
## tickets database