From 76c3048a15719bc1dd15287fd3406e94d40684ab Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 28 Nov 2013 12:00:50 -0500
Subject: fix soledad couchdb hiera variables

Change-Id: I0882fc993b407eddc40c03838050d42c0443bd3d
---
 provider_base/services/soledad.json        | 1 +
 puppet/modules/leap_mx/manifests/init.pp   | 6 +++---
 puppet/modules/soledad/manifests/server.pp | 7 +++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/provider_base/services/soledad.json b/provider_base/services/soledad.json
index dc12454b..9c8567b8 100644
--- a/provider_base/services/soledad.json
+++ b/provider_base/services/soledad.json
@@ -3,5 +3,6 @@
     "port": 2323,
     "require_couchdb": "=> assert %(services.include? 'couchdb')"
   },
+  "couchdb_soledad_user": "= global.services[:couchdb].couch.users[:soledad]",
   "service_type": "public_service"
 }
diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index d1625f5a..e0c3660b 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -1,8 +1,8 @@
 class leap_mx {
 
-  $mx               = hiera('mx')
-  $couchdb_user     = $mx['couchdb_leap_mx_user']['username']
-  $couchdb_password = $mx['couchdb_leap_mx_password']['password']
+  $leap_mx          = hiera('couchdb_leap_mx_user')
+  $couchdb_user     = $leap_mx['username']
+  $couchdb_password = $leap_mx['password']
 
   $couchdb_port     = '4096'
 
diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index 339030fc..d4991fe6 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -3,10 +3,9 @@ class soledad::server {
   include soledad
   include site_apt::preferences::twisted
 
-  $couchdb           = hiera('couch')
-  $couchdb_users     = $couchdb['users']
-  $couchdb_user      = $couchdb_users['soledad']['username']
-  $couchdb_password  = $couchdb_users['soledad']['password']
+  $soledad           = hiera('soledad')
+  $couchdb_user      = $soledad['couchdb_soledad_user']['username']
+  $couchdb_password  = $soledad['couchdb_soledad_password']['password']
 
   $couchdb_host = 'localhost'
   $couchdb_port = '5984'
-- 
cgit v1.2.3