summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-11-28 12:25:36 -0500
committerMicah Anderson <micah@leap.se>2013-11-28 12:25:36 -0500
commitb62056da276abb8eb6ef6d6c883c5d20da2017d8 (patch)
tree1246467e5a66f203aae7c8510e5bb64dd3d07fae /puppet
parent81ff8e2b6aaebae35098357146958a8011af85fe (diff)
fix soledad couchdb hiera variables, part ii
Change-Id: Ie0028056767358c4fe6796edd5ba4435e86a0cb3
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/soledad/manifests/server.pp3
1 files changed, 1 insertions, 2 deletions
diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index d4991fe6..572cad44 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -5,12 +5,11 @@ class soledad::server {
$soledad = hiera('soledad')
$couchdb_user = $soledad['couchdb_soledad_user']['username']
- $couchdb_password = $soledad['couchdb_soledad_password']['password']
+ $couchdb_password = $soledad['couchdb_soledad_user']['password']
$couchdb_host = 'localhost'
$couchdb_port = '5984'
- $soledad = hiera('soledad')
$soledad_port = $soledad['port']
include site_config::x509::cert