summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-11-28 11:52:31 -0500
committerMicah Anderson <micah@leap.se>2013-11-28 12:16:17 -0500
commit408621e4b57b9df1d67fa32eba8d15b83b8d1fd4 (patch)
tree5e4beecc5dd36412d9e0049d042f09211b29c785 /puppet/modules
parenta241d230f01ac2c89405f4ef12f5d27bdedf1543 (diff)
remove leap_mx admin user and fix leap_mx couchdb hiera variables
Change-Id: I052576279d8a47313cd99412fdd7b715daa73374
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/leap_mx/manifests/init.pp7
1 files changed, 3 insertions, 4 deletions
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'