aboutsummaryrefslogtreecommitdiff
path: root/test/provider/services
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-11-06 23:46:57 -0800
committerelijah <elijah@riseup.net>2012-11-06 23:46:57 -0800
commit96634bb77059ca074a4713e0d143c99266b4d55f (patch)
tree75b172b5478c5cb29b356dd025492cf2a21268f9 /test/provider/services
parent68674e6d2d85ca42e0d56a63f3ea2441c7e7e992 (diff)
downloadleap_cli-96634bb77059ca074a4713e0d143c99266b4d55f.tar.gz
leap_cli-96634bb77059ca074a4713e0d143c99266b4d55f.tar.bz2
updated test/provider and added configurable life_span to CA.
Diffstat (limited to 'test/provider/services')
-rw-r--r--test/provider/services/couchdb.json6
-rw-r--r--test/provider/services/webapp.json3
2 files changed, 7 insertions, 2 deletions
diff --git a/test/provider/services/couchdb.json b/test/provider/services/couchdb.json
index 9024aa0..1cbc84e 100644
--- a/test/provider/services/couchdb.json
+++ b/test/provider/services/couchdb.json
@@ -1,3 +1,7 @@
{
- "service_type": "internal_service"
+ "service_type": "internal_service",
+ "users": {
+ "admin": {"username":"admin", "password":"= secret :couch_admin_password"},
+ "webapp": {"username":"webapp", "password":"= secret :couch_webapp_password"}
+ }
} \ No newline at end of file
diff --git a/test/provider/services/webapp.json b/test/provider/services/webapp.json
index 0e5b2f9..247df49 100644
--- a/test/provider/services/webapp.json
+++ b/test/provider/services/webapp.json
@@ -1,7 +1,8 @@
{
"webapp": {
"modules": ["user", "billing", "help"],
- "couchdb_hosts": "= nodes[:services => :couchdb].field('domain.name')"
+ "couchdb_hosts": "= nodes[:services => :couchdb].field('domain.name')",
+ "couchdb_users": "= global.services['couchdb'].users['admin']"
},
"definition_files": {
"provider": "= file('service-definitions/provider.json.erb')",