diff options
| author | Micah Anderson <micah@leap.se> | 2014-04-17 09:35:17 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-04-17 16:09:46 -0400 |
| commit | af1f6d6fc248b02ef51ceedb3257579f09c8febf (patch) | |
| tree | 694c88c290dcf6d5bf598024af9d20496cb5ddb7 | |
| parent | 42d93c7a939902ace20ed5602317530473ece364 (diff) | |
Change couchdb ordering hints (#5269, #4590, #3712):
. make the couchdb service start after the stunnels have been
setup. This may improve the cluster membership coming online
faster
. replace the two Couchdb::Create_db ordering hints (for the
'users' and 'tokens' databases) with a generic
Class['site_config::create_dbs'] hint. This makes it so we get
the ordering hint for all databases, which we were not before,
without having to individually list them
. replace the two Couchdb::Add_user ordering hints (for the
$couchdb_webapp_user and the $couchdb_soledad_user) with a
generic ordering hint for Class['site_couchdb::add_users']
ordering hint. This makes it so we get the ordering hint for all
the users, which we were not before, without having to
individually list them
Change-Id: Ia63e62d68d24e77a49d4ef928a2a8130ab7bccb9
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 8c790bd2..d8e03e41 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -60,15 +60,13 @@ class site_couchdb { Class['site_config::default'] -> Class['couchdb::bigcouch::package::cloudant'] -> Service['shorewall'] - -> Service['couchdb'] -> Class['site_couchdb::stunnel'] + -> Service['couchdb'] -> File['/root/.netrc'] -> Class['site_couchdb::bigcouch::add_nodes'] -> Class['site_couchdb::bigcouch::settle_cluster'] - -> Couchdb::Create_db['users'] - -> Couchdb::Create_db['tokens'] - -> Couchdb::Add_user[$couchdb_webapp_user] - -> Couchdb::Add_user[$couchdb_soledad_user] + -> Class['site_couchdb::create_dbs'] + -> Class['site_couchdb::add_users'] class { 'site_couchdb::stunnel': } |