diff options
| author | varac <varacanero@zeromail.org> | 2015-06-05 11:54:02 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-06-21 10:24:22 +0100 |
| commit | dc2611f2fc2aab1c441d524862af30b349323c7c (patch) | |
| tree | 4d6b4f1e5eb16f0158c915dc9475c3bf0670f683 | |
| parent | da6916d66cb78c185f068ff60d613dbe98e9f1ca (diff) | |
Support plain couchdb (#6067)
The bigcouch specific class ordering from site_couchdb::create_dbs
needed to move to site_couchdb::bigcouch, otherwise a plain couchdb
setup would try to include bigcouch classes and fail.
Change-Id: I06742d4a12c5b40c9c9faa90441734e6926d422d
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/bigcouch.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/create_dbs.pp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/puppet/modules/site_couchdb/manifests/bigcouch.pp b/puppet/modules/site_couchdb/manifests/bigcouch.pp index 82c85b52..469a2783 100644 --- a/puppet/modules/site_couchdb/manifests/bigcouch.pp +++ b/puppet/modules/site_couchdb/manifests/bigcouch.pp @@ -1,3 +1,4 @@ +# sets up bigcouch on couchdb node class site_couchdb::bigcouch { $config = $::site_couchdb::couchdb_config['bigcouch'] @@ -24,6 +25,7 @@ class site_couchdb::bigcouch { -> Class['site_couchdb::setup'] -> Class['site_couchdb::bigcouch::add_nodes'] -> Class['site_couchdb::bigcouch::settle_cluster'] + -> Class['site_couchdb::create_dbs'] include site_couchdb::bigcouch::add_nodes include site_couchdb::bigcouch::settle_cluster diff --git a/puppet/modules/site_couchdb/manifests/create_dbs.pp b/puppet/modules/site_couchdb/manifests/create_dbs.pp index 8285a4e3..eea4bbf5 100644 --- a/puppet/modules/site_couchdb/manifests/create_dbs.pp +++ b/puppet/modules/site_couchdb/manifests/create_dbs.pp @@ -2,7 +2,6 @@ class site_couchdb::create_dbs { Class['site_couchdb::setup'] - -> Class['site_couchdb::bigcouch::settle_cluster'] -> Class['site_couchdb::create_dbs'] ### customer database |