From 70df05dce934a3d3803ea78e39200c37215cad04 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 24 Feb 2016 11:22:53 +0100 Subject: Use site_couchdb::plain even when couch.master is set top "master" --- puppet/modules/site_couchdb/manifests/init.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 0c126f0c..0c282e1c 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -40,8 +40,9 @@ class site_couchdb { $couchdb_mode = $couchdb_config['mode'] $couchdb_pwhash_alg = $couchdb_config['pwhash_alg'] - if $couchdb_mode == 'multimaster' { include site_couchdb::bigcouch } - if $couchdb_mode == 'plain' { include site_couchdb::plain } + if $couchdb_mode == 'multimaster' { include site_couchdb::bigcouch } + if $couchdb_mode =~ /^(plain|master)$/ { include site_couchdb::plain } + # if $couchdb_mode == 'mirror' { include site_couchdb::mirror } Class['site_config::default'] -- cgit v1.2.3