From 408621e4b57b9df1d67fa32eba8d15b83b8d1fd4 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 28 Nov 2013 11:52:31 -0500
Subject: remove leap_mx admin user and fix leap_mx couchdb hiera variables

Change-Id: I052576279d8a47313cd99412fdd7b715daa73374
---
 puppet/modules/leap_mx/manifests/init.pp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'puppet/modules/leap_mx/manifests/init.pp')

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'
 
-- 
cgit v1.2.3