CORD-1253 onboard the AddressManager service

Change-Id: I56aa0befc38de0a43f53b886a348cf61bc25e0aa
diff --git a/roles/cord-profile/templates/public-net.yaml.j2 b/roles/cord-profile/templates/public-net.yaml.j2
index d7ddd25..7e43e11 100644
--- a/roles/cord-profile/templates/public-net.yaml.j2
+++ b/roles/cord-profile/templates/public-net.yaml.j2
@@ -20,6 +20,7 @@
 
 imports:
    - custom_types/xos.yaml
+   - custom_types/addressmanager.yaml
 
 description: public network config, generated by platform-install
 
@@ -31,9 +32,9 @@
       type: tosca.nodes.Site
 
 
-# vrouter service, fully created in cord-service.yaml
-    service#vrouter:
-      type: tosca.nodes.VRouterService
+# Address Manager service, fully created in cord-service.yaml
+    service#addressmanager:
+      type: tosca.nodes.AddressManagerService
 
 # public network
 
@@ -55,8 +56,8 @@
           - owner:
               node: {{ site_name }}_public
               relationship: tosca.relationships.MemberOfSlice
-          - vrouter_tenant:
-              node: service#vrouter
+          - addressmanager_service_instance:
+              node: service#addressmanager
               relationship: tosca.relationships.TenantOfService