From 76c3048a15719bc1dd15287fd3406e94d40684ab Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 28 Nov 2013 12:00:50 -0500 Subject: fix soledad couchdb hiera variables Change-Id: I0882fc993b407eddc40c03838050d42c0443bd3d --- puppet/modules/soledad/manifests/server.pp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'puppet/modules/soledad') 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