diff options
| author | varac <varacanero@zeromail.org> | 2016-02-24 11:22:53 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-02-24 11:22:53 +0100 |
| commit | 70df05dce934a3d3803ea78e39200c37215cad04 (patch) | |
| tree | bbe6df60a9da4f2900e5b51bc20ddf3ad8186ccf /puppet/modules | |
| parent | 75fcdd7672036c7c0a11728a37ac9b17507b7a53 (diff) | |
Use site_couchdb::plain even when couch.master is set top "master"
Diffstat (limited to 'puppet/modules')
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 5 |
1 files 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'] |