diff options
| author | Micah Anderson <micah@riseup.net> | 2013-05-26 17:12:18 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-05-26 17:12:18 -0400 |
| commit | 13ffb62b3e24521117770e43ab17212a9f980b0d (patch) | |
| tree | 73ff49e3fbc96e9b7df1f1010f0c5d28d49e4571 /puppet/modules/site_couchdb | |
| parent | e7b927d607e1e3bb02cfb8910d69df5254af5f35 (diff) | |
| parent | fed63320dc026f8ea1e0f0de250c8008f6f71b7e (diff) | |
Merge remote-tracking branch 'leap/develop' into develop
Diffstat (limited to 'puppet/modules/site_couchdb')
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp | 5 | ||||
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp b/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp new file mode 100644 index 00000000..241a4914 --- /dev/null +++ b/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp @@ -0,0 +1,5 @@ +class site_couchdb::bigcouch::add_nodes { + # loop through neighbors array and add nodes + $nodes = $::site_couchdb::bigcouch_config['neighbors'] + couchdb::bigcouch::add_node { $nodes: } +} 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, |