diff options
| author | varac <varacanero@zeromail.org> | 2013-08-01 10:28:59 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-08-01 10:28:59 +0200 |
| commit | f1c0f1e49e9bddcda575ff72148d04549f44c0bc (patch) | |
| tree | 5f81d52715ee906a57d863a9f9070ebe2abb009f | |
| parent | 80b196be84d96b92e83acc680130a01370298c13 (diff) | |
| parent | 80ae781667ab1d8803593e03fc9c928b86db5e97 (diff) | |
Merge branch 'feature/issue/3347' into develop
| -rw-r--r-- | provider_base/services/mx.json | 1 | ||||
| -rw-r--r-- | puppet/modules/leap_mx/manifests/init.pp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json index 91ad3277..d633d1dc 100644 --- a/provider_base/services/mx.json +++ b/provider_base/services/mx.json @@ -8,6 +8,7 @@ "haproxy": { "local_ports": "= stunnel.couch_client.field(:accept_port)" }, + "couchdb_admin_user": "= global.services[:couchdb].couch.users[:admin]", "x509": { "use": true, "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap cert ca`'", diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp index 23fd1054..1e186bbb 100644 --- a/puppet/modules/leap_mx/manifests/init.pp +++ b/puppet/modules/leap_mx/manifests/init.pp @@ -1,9 +1,10 @@ class leap_mx { + $couchdb_admin_user = hiera('couchdb_admin_user') $couchdb_host = 'localhost' $couchdb_port = '4096' - $couchdb_user = $soledad::couchdb::user - $couchdb_password = $soledad::couchdb::password + $couchdb_user = $couchdb_admin_user['username'] + $couchdb_password = $couchdb_admin_user['password'] # # USER AND GROUP |