From 96634bb77059ca074a4713e0d143c99266b4d55f Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 6 Nov 2012 23:46:57 -0800 Subject: updated test/provider and added configurable life_span to CA. --- test/provider/services/couchdb.json | 6 +++++- test/provider/services/webapp.json | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'test/provider/services') 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')", -- cgit v1.2.3