diff options
author | Micah Anderson <micah@riseup.net> | 2013-05-23 18:03:32 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-05-23 18:03:32 -0400 |
commit | 42363772fe4febfd72fc31b809201f562de704cb (patch) | |
tree | 7372c1c31ca285d616200a6caf45a19d4b2e5c8e /puppet/modules/site_couchdb/manifests/init.pp | |
parent | f96d049c407110fb471199ee73c47db8b7cd474a (diff) | |
parent | 064195792e264a125b9bd75ff931552af054ecf9 (diff) |
Merge remote-tracking branch 'origin/feature/issue_2658' into develop
Diffstat (limited to 'puppet/modules/site_couchdb/manifests/init.pp')
-rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 9f4824b4..802f3224 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -33,9 +33,12 @@ class site_couchdb { bigcouch_cookie => $bigcouch_cookie, ednp_port => $ednp_port } - include couchdb::bigcouch::package::cloudant - Service ['couchdb'] + class { 'couchdb::bigcouch::package::cloudant': } + + Class ['couchdb::bigcouch::package::cloudant'] + -> Service ['couchdb'] + -> Class ['site_couchdb::bigcouch::add_nodes'] -> Couchdb::Create_db['users'] -> Couchdb::Create_db['tokens'] -> Couchdb::Add_user[$couchdb_webapp_user] @@ -47,6 +50,8 @@ class site_couchdb { ca => $ca } + class { 'site_couchdb::bigcouch::add_nodes': } + couchdb::query::setup { 'localhost': user => $couchdb_admin_user, pw => $couchdb_admin_pw, |