From 21b4bd1fd1e875716b09572006d309221772a43c Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 20 Dec 2016 10:12:39 -0800 Subject: bugfix: couchdb nodes should not require soledad. closes #8693 --- puppet/modules/site_couchdb/manifests/create_dbs.pp | 11 +++++++---- 1 file 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 -- cgit v1.2.3