4 files changed, 17 insertions, 10 deletions
diff --git a/test/provider/services/couchdb.json b/test/provider/services/couchdb.json
index 7c13c8d..9024aa0 100644
--- a/test/provider/services/couchdb.json
+++ b/test/provider/services/couchdb.json
@@ -1,3 +1,3 @@
 {
-  "public_dns": false
+  "service_type": "internal_service"
 }
 \ No newline at end of file
diff --git a/test/provider/services/dns.json b/test/provider/services/dns.json
index 3fea381..677d9b2 100644
--- a/test/provider/services/dns.json
+++ b/test/provider/services/dns.json
@@ -1,6 +1,7 @@
 {
   "hosts": {
-    "public":  "= nodes[:public_dns => true].fields(:fqdn, :dns_alias, :ip_address)",
-    "private": "= nodes[:public_dns => false].fields(:fqdn, :dns_alias, :ip_address)"
-  }
+    "public":  "= nodes['dns.public' => true].fields('domain.name', 'dns.aliases', 'ip_address')",
+    "private": "= nodes['dns.public' => false].fields('domain.name', 'dns.aliases', 'ip_address')"
+  },
+  "service_type": "public_service"
 }
 \ No newline at end of file
diff --git a/test/provider/services/openvpn.json b/test/provider/services/openvpn.json
index ffaa313..e7e8150 100644
--- a/test/provider/services/openvpn.json
+++ b/test/provider/services/openvpn.json
@@ -5,7 +5,8 @@
     "nat": true,
     "ca_crt": "= file 'ca/ca.crt'",
     "ca_key": "= file 'ca/ca.key'",
-    "server_crt": "= file fqdn + '.crt'",
-    "server_key": "= file fqdn + '.key'"
-  }
+    "server_crt": "= file domain.name + '.crt'",
+    "server_key": "= file domain.name + '.key'"
+  },
+  "service_type": "user_service"
 }
diff --git a/test/provider/services/webapp.json b/test/provider/services/webapp.json
index 5a045b2..bfd701d 100644
--- a/test/provider/services/webapp.json
+++ b/test/provider/services/webapp.json
@@ -1,10 +1,15 @@
-#   "dns_alias": "= 'user.' + domain_public",
 {
   "webapp": {
     "modules": ["user", "billing", "help"],
-    "couchdb_hosts": "= nodes[:services => :couchdb].field(:fqdn)"
+    "couchdb_hosts": "= nodes[:services => :couchdb].field('domain.name')"
   },
   "definition_files": {
-    "provider": "= file('public-definitions/provider.json.erb')"
+    "provider": "= file('service-definitions/provider.json.erb')",
+    "eip_service": "file('service-definitions/eip-service.json.erb')"
+  },
+  "service_type": "public_service",
+  "api_domain": "= 'api.' + domain.public",
+  "dns": {
+    "aliases": "= [domain.public, api_domain]"
   }
 }
 \ No newline at end of file