From 5bafe7947a20b1d6208577ad6151053701243382 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 14 Nov 2012 23:08:59 -0800 Subject: inherit .json from leap_platform/provider_base --- test/provider/services/couchdb.json | 7 ------- test/provider/services/openvpn.json | 16 ---------------- test/provider/services/webapp.json | 16 ---------------- 3 files changed, 39 deletions(-) delete mode 100644 test/provider/services/couchdb.json delete mode 100644 test/provider/services/openvpn.json delete mode 100644 test/provider/services/webapp.json (limited to 'test/provider/services') diff --git a/test/provider/services/couchdb.json b/test/provider/services/couchdb.json deleted file mode 100644 index 1cbc84e..0000000 --- a/test/provider/services/couchdb.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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/openvpn.json b/test/provider/services/openvpn.json deleted file mode 100644 index 958320f..0000000 --- a/test/provider/services/openvpn.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "openvpn": { - "ports": ["80", "443", "53", "1194"], - "filter_dns": false, - "nat": true, - "ca_crt": "= file 'ca/ca.crt'", - "ca_key": "= file 'ca/ca.key'", - "dh": "= file 'ca/dh.pem'", - "server_crt": "= file :node_x509_cert", - "server_key": "= file :node_x509_key" - }, - "service_type": "user_service" - #"x509": { - # "use": true - #} -} diff --git a/test/provider/services/webapp.json b/test/provider/services/webapp.json deleted file mode 100644 index 247df49..0000000 --- a/test/provider/services/webapp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "webapp": { - "modules": ["user", "billing", "help"], - "couchdb_hosts": "= nodes[:services => :couchdb].field('domain.name')", - "couchdb_users": "= global.services['couchdb'].users['admin']" - }, - "definition_files": { - "provider": "= file('service-definitions/provider.json.erb')", - "eip_service": "file('service-definitions/eip-service.json.erb')" - }, - "service_type": "public_service", - "api_domain": "= 'api.' + domain.full_suffix", - "dns": { - "aliases": "= [domain.full, api_domain]" - } -} \ No newline at end of file -- cgit v1.2.3