diff options
| author | Micah Anderson <micah@leap.se> | 2013-11-28 12:25:36 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-11-28 12:25:36 -0500 |
| commit | b62056da276abb8eb6ef6d6c883c5d20da2017d8 (patch) | |
| tree | 1246467e5a66f203aae7c8510e5bb64dd3d07fae | |
| parent | 81ff8e2b6aaebae35098357146958a8011af85fe (diff) | |
fix soledad couchdb hiera variables, part ii
Change-Id: Ie0028056767358c4fe6796edd5ba4435e86a0cb3
| -rw-r--r-- | provider_base/services/soledad.json | 4 | ||||
| -rw-r--r-- | puppet/modules/soledad/manifests/server.pp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/provider_base/services/soledad.json b/provider_base/services/soledad.json index 9c8567b8..fc349ce1 100644 --- a/provider_base/services/soledad.json +++ b/provider_base/services/soledad.json @@ -1,8 +1,8 @@ { "soledad": { "port": 2323, - "require_couchdb": "=> assert %(services.include? 'couchdb')" + "require_couchdb": "=> assert %(services.include? 'couchdb')", + "couchdb_soledad_user": "= global.services[:couchdb].couch.users[:soledad]" }, - "couchdb_soledad_user": "= global.services[:couchdb].couch.users[:soledad]", "service_type": "public_service" } 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 |