summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------puppet/modules/apt0
m---------puppet/modules/couchdb0
-rw-r--r--puppet/modules/site_webapp/manifests/couchdb.pp5
3 files changed, 4 insertions, 1 deletions
diff --git a/puppet/modules/apt b/puppet/modules/apt
-Subproject 7e8113b3fcf6f251ca9d5e2f39f43fd024058c9
+Subproject 6bf7a6ab5d6e63f75c94f49aa0f12959e954efa
diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb
-Subproject 77b80561e187c93f7c48f5ac4136e800702b0ce
+Subproject a4809d6b0627431f72de916abee1214418c01c9
diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp
index 26de62ee..b8a4201d 100644
--- a/puppet/modules/site_webapp/manifests/couchdb.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb.pp
@@ -5,7 +5,10 @@ class site_webapp::couchdb {
$cert = $x509['cert']
$ca = $x509['ca_cert']
$webapp = hiera('webapp')
- $couchdb_host = $webapp['couchdb_hosts']
+ $couchdb_hosts = $webapp['couchdb_hosts']
+ # for now, pick the first couchdb host before we have a working
+ # load balancing setup (see https://leap.se/code/issues/1994)
+ $couchdb_host = $couchdb_hosts[0]
$couchdb_user = $webapp['couchdb_user']['username']
$couchdb_password = $webapp['couchdb_user']['password']