diff options
| author | varac <varacanero@zeromail.org> | 2014-10-31 21:14:58 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-10-31 21:14:58 +0100 |
| commit | 75a79fc46bb4a165f16efd28a341f4f531664584 (patch) | |
| tree | 12b59ff5fe8ea119ea31b2356615b034741b3ed8 | |
| parent | 1d4670f8b9b4c1f3d4cd8017a3f6145ccdd41312 (diff) | |
| parent | 84957fbd0f1e4aa26303b6488d9ec7df8af08ab7 (diff) | |
Merge branch 'develop' of ssh://review.leap.se:29418/Platform into develop
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/bigcouch.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/modules/site_couchdb/manifests/bigcouch.pp b/puppet/modules/site_couchdb/manifests/bigcouch.pp index f0aab734..e3cba4ba 100644 --- a/puppet/modules/site_couchdb/manifests/bigcouch.pp +++ b/puppet/modules/site_couchdb/manifests/bigcouch.pp @@ -1,12 +1,12 @@ class site_couchdb::bigcouch { - $config = $couchdb_config['bigcouch'] + $config = $::site_couchdb::couchdb_config['bigcouch'] $cookie = $config['cookie'] $ednp_port = $config['ednp_port'] class { 'couchdb': - admin_pw => $couchdb_admin_pw, - admin_salt => $couchdb_admin_salt, + admin_pw => $::site_couchdb::couchdb_admin_pw, + admin_salt => $::site_couchdb::couchdb_admin_salt, bigcouch => true, bigcouch_cookie => $cookie, ednp_port => $ednp_port, |