summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-11-28 12:00:50 -0500
committerMicah Anderson <micah@leap.se>2013-11-28 12:16:24 -0500
commit76c3048a15719bc1dd15287fd3406e94d40684ab (patch)
tree99f5896800d0b1fe0be86c9ff5bfe8ca317c5da8 /puppet
parent408621e4b57b9df1d67fa32eba8d15b83b8d1fd4 (diff)
fix soledad couchdb hiera variables
Change-Id: I0882fc993b407eddc40c03838050d42c0443bd3d
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/leap_mx/manifests/init.pp6
-rw-r--r--puppet/modules/soledad/manifests/server.pp7
2 files changed, 6 insertions, 7 deletions
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'