summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--provider_base/services/mx.json1
-rw-r--r--puppet/modules/leap_mx/manifests/init.pp5
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