diff options
| author | Micah Anderson <micah@leap.se> | 2013-11-28 11:52:31 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-11-28 12:16:17 -0500 |
| commit | 408621e4b57b9df1d67fa32eba8d15b83b8d1fd4 (patch) | |
| tree | 5e4beecc5dd36412d9e0049d042f09211b29c785 | |
| parent | a241d230f01ac2c89405f4ef12f5d27bdedf1543 (diff) | |
remove leap_mx admin user and fix leap_mx couchdb hiera variables
Change-Id: I052576279d8a47313cd99412fdd7b715daa73374
| -rw-r--r-- | provider_base/services/mx.json | 2 | ||||
| -rw-r--r-- | puppet/modules/leap_mx/manifests/init.pp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json index 7b0aa57b..9d0ee532 100644 --- a/provider_base/services/mx.json +++ b/provider_base/services/mx.json @@ -5,7 +5,7 @@ "haproxy": { "servers": "= haproxy_servers(nodes_like_me[:services => :couchdb], stunnel.couch_client)" }, - "couchdb_admin_user": "= global.services[:couchdb].couch.users[:admin]", + "couchdb_leap_mx_user": "= global.services[:couchdb].couch.users[:leap_mx]", "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 0d05a834..d1625f5a 100644 --- a/puppet/modules/leap_mx/manifests/init.pp +++ b/puppet/modules/leap_mx/manifests/init.pp @@ -1,9 +1,8 @@ class leap_mx { - $couchdb = hiera('couch') - $couchdb_users = $couchdb['users'] - $couchdb_user = $couchdb_users['leap_mx']['username'] - $couchdb_password = $couchdb_users['leap_mx']['password'] + $mx = hiera('mx') + $couchdb_user = $mx['couchdb_leap_mx_user']['username'] + $couchdb_password = $mx['couchdb_leap_mx_password']['password'] $couchdb_port = '4096' |