diff options
| author | elijah <elijah@riseup.net> | 2016-02-01 15:56:41 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-02-23 09:50:58 -0800 |
| commit | da2c743faaccd26604c4c26fbb1557934688eb4a (patch) | |
| tree | bda43f9cb86d736183d4db8929b455a03ca77c0b /puppet/modules | |
| parent | 685642e8bfdaff16a4f02bd40b5d2aef15b68d94 (diff) | |
default to plain couchdb, unless otherwise specified.
# Conflicts:
# puppet/modules/site_couchdb/manifests/plain.pp
Diffstat (limited to 'puppet/modules')
| -rw-r--r-- | puppet/modules/site_check_mk/manifests/agent/couchdb/plain.pp (renamed from puppet/modules/site_check_mk/manifests/agent/couchdb/master.pp) | 2 | ||||
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 4 | ||||
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/plain.pp (renamed from puppet/modules/site_couchdb/manifests/master.pp) | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb/master.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb/plain.pp index 291b87d1..3ec2267b 100644 --- a/puppet/modules/site_check_mk/manifests/agent/couchdb/master.pp +++ b/puppet/modules/site_check_mk/manifests/agent/couchdb/plain.pp @@ -1,5 +1,5 @@ # configure logwatch and nagios checks for plain single couchdb master -class site_check_mk::agent::couchdb::master { +class site_check_mk::agent::couchdb::plain { # remove bigcouch leftovers augeas { diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 8d79ae75..0c126f0c 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -41,8 +41,8 @@ class site_couchdb { $couchdb_pwhash_alg = $couchdb_config['pwhash_alg'] if $couchdb_mode == 'multimaster' { include site_couchdb::bigcouch } - if $couchdb_mode == 'master' { include site_couchdb::master } - if $couchdb_mode == 'mirror' { include site_couchdb::mirror } + if $couchdb_mode == 'plain' { include site_couchdb::plain } + # if $couchdb_mode == 'mirror' { include site_couchdb::mirror } Class['site_config::default'] -> Service['shorewall'] diff --git a/puppet/modules/site_couchdb/manifests/master.pp b/puppet/modules/site_couchdb/manifests/plain.pp index 49d90f2f..64209142 100644 --- a/puppet/modules/site_couchdb/manifests/master.pp +++ b/puppet/modules/site_couchdb/manifests/plain.pp @@ -1,5 +1,5 @@ # this class sets up a single, plain couchdb node -class site_couchdb::master { +class site_couchdb::plain { class { 'couchdb': admin_pw => $site_couchdb::couchdb_admin_pw, admin_salt => $site_couchdb::couchdb_admin_salt, @@ -7,7 +7,7 @@ class site_couchdb::master { pwhash_alg => $site_couchdb::couchdb_pwhash_alg } - include site_check_mk::agent::couchdb::master + include site_check_mk::agent::couchdb::plain # remove bigcouch leftovers from previous installations include ::site_config::remove::bigcouch |