diff options
| author | Varac <varac@leap.se> | 2016-12-21 08:43:09 +0000 |
|---|---|---|
| committer | Varac <varac@leap.se> | 2016-12-21 08:43:09 +0000 |
| commit | 9dd91e45703e129838bdc491afceb183e4bbab02 (patch) | |
| tree | 3d3a801d3394591509f86b05b53b9e03156eaca7 /puppet/modules | |
| parent | b8edc5589c7f38d807e7db069bf3703ae439db01 (diff) | |
| parent | 866af737a3e641008c05a210d04a4dc5e5bcfbc4 (diff) | |
Merge branch 'bugfix/sans-soledad' into 'master'
bugfix: couchdb nodes should not require soledad. closes #8693
See merge request !60
Diffstat (limited to 'puppet/modules')
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/create_dbs.pp | 11 |
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 |