6 files changed, 66 insertions, 25 deletions
diff --git a/test/provider/hiera/couch1.yaml b/test/provider/hiera/couch1.yaml
index a954a14..0a6213c 100644
--- a/test/provider/hiera/couch1.yaml
+++ b/test/provider/hiera/couch1.yaml
@@ -1,9 +1,11 @@
 --- 
+dns: 
+  public: false
 domain: 
   internal: rewire
+  name: couch1.rewire
   public: rewire.co
-fqdn: couch1.rewire
 ip_address: 245.2.45.42
 name: couch1
-public_dns: false
+service_type: internal_service
 services: couchdb
diff --git a/test/provider/hiera/couch2.yaml b/test/provider/hiera/couch2.yaml
index 208e64c..212b057 100644
--- a/test/provider/hiera/couch2.yaml
+++ b/test/provider/hiera/couch2.yaml
@@ -1,9 +1,11 @@
 --- 
+dns: 
+  public: false
 domain: 
   internal: rewire
+  name: couch2.rewire
   public: rewire.co
-fqdn: couch2.rewire
 ip_address: 73.45.87.11
 name: couch2
-public_dns: false
+service_type: internal_service
 services: couchdb
diff --git a/test/provider/hiera/ns1.yaml b/test/provider/hiera/ns1.yaml
index 721e721..da996a6 100644
--- a/test/provider/hiera/ns1.yaml
+++ b/test/provider/hiera/ns1.yaml
@@ -1,26 +1,31 @@
 --- 
+dns: 
+  public: true
 domain: 
   internal: rewire
+  name: ns1.rewire.co
   public: rewire.co
-fqdn: ns1.rewire.co
 hosts: 
   private: 
-  - fqdn: couch1.rewire
+  - domain_name: couch1.rewire
     ip_address: 245.2.45.42
-  - fqdn: couch2.rewire
+  - domain_name: couch2.rewire
     ip_address: 73.45.87.11
   public: 
-  - fqdn: ns1.rewire.co
+  - domain_name: ns1.rewire.co
     ip_address: 1.1.1.1
-  - fqdn: ns2.rewire.co
+  - domain_name: ns2.rewire.co
     ip_address: 1.1.1.2
-  - fqdn: vpn1.rewire.co
+  - domain_name: vpn1.rewire.co
     ip_address: 2.2.2.2
-  - fqdn: web1.rewire.co
+  - dns_aliases: 
+    - rewire.co
+    - api.rewire.co
+    domain_name: web1.rewire.co
     ip_address: 6.6.7.7
 ip_address: 1.1.1.1
 name: ns1
 production: true
-public_dns: true
+service_type: public_service
 services: dns
 tags: production
diff --git a/test/provider/hiera/ns2.yaml b/test/provider/hiera/ns2.yaml
index b64a238..bac04d4 100644
--- a/test/provider/hiera/ns2.yaml
+++ b/test/provider/hiera/ns2.yaml
@@ -1,26 +1,31 @@
 --- 
+dns: 
+  public: true
 domain: 
   internal: rewire
+  name: ns2.rewire.co
   public: rewire.co
-fqdn: ns2.rewire.co
 hosts: 
   private: 
-  - fqdn: couch1.rewire
+  - domain_name: couch1.rewire
     ip_address: 245.2.45.42
-  - fqdn: couch2.rewire
+  - domain_name: couch2.rewire
     ip_address: 73.45.87.11
   public: 
-  - fqdn: ns1.rewire.co
+  - domain_name: ns1.rewire.co
     ip_address: 1.1.1.1
-  - fqdn: ns2.rewire.co
+  - domain_name: ns2.rewire.co
     ip_address: 1.1.1.2
-  - fqdn: vpn1.rewire.co
+  - domain_name: vpn1.rewire.co
     ip_address: 2.2.2.2
-  - fqdn: web1.rewire.co
+  - dns_aliases: 
+    - rewire.co
+    - api.rewire.co
+    domain_name: web1.rewire.co
     ip_address: 6.6.7.7
 ip_address: 1.1.1.2
 name: ns2
 production: true
-public_dns: true
+service_type: public_service
 services: dns
 tags: production
diff --git a/test/provider/hiera/vpn1.yaml b/test/provider/hiera/vpn1.yaml
index d21d4f6..a2e226d 100644
--- a/test/provider/hiera/vpn1.yaml
+++ b/test/provider/hiera/vpn1.yaml
@@ -1,8 +1,10 @@
 --- 
+dns: 
+  public: true
 domain: 
   internal: rewire
+  name: vpn1.rewire.co
   public: rewire.co
-fqdn: vpn1.rewire.co
 ip_address: 2.2.2.2
 name: vpn1
 openvpn: 
@@ -155,6 +157,6 @@ openvpn:
     -----END RSA PRIVATE KEY-----
 
 production: true
-public_dns: true
+service_type: user_service
 services: openvpn
 tags: production
diff --git a/test/provider/hiera/web1.yaml b/test/provider/hiera/web1.yaml
index 88c75d5..1b12e3e 100644
--- a/test/provider/hiera/web1.yaml
+++ b/test/provider/hiera/web1.yaml
@@ -1,13 +1,38 @@
 --- 
+api_domain: api.rewire.co
 definition_files: 
-  provider: <%= {:hi => 'yes'}.to_json %>
+  eip_service: file('service-definitions/eip-service.json.erb')
+  provider: |-
+    {
+      "api_uri": "https://api.rewire.co",
+      "api_version": "1",
+      "description": {
+        "en": "A demonstration service provider using the LEAP platform"
+      },
+      "domain": "rewire.co",
+      "enrollment_policy": "open",
+      "languages": [
+        "en"
+      ],
+      "name": {
+        "en": "The Rewire Company"
+      },
+      "services": [
+        "openvpn"
+      ]
+    }
+dns: 
+  aliases: 
+  - rewire.co
+  - api.rewire.co
+  public: true
 domain: 
   internal: rewire
+  name: web1.rewire.co
   public: rewire.co
-fqdn: web1.rewire.co
 ip_address: 6.6.7.7
 name: web1
-public_dns: true
+service_type: public_service
 services: webapp
 webapp: 
   couchdb_hosts: