[CORD-2303]
Use FQDN for lookup of service endpoints
Change-Id: I73723e7855254c56b4cb8b1f472d712cc30f4926
diff --git a/roles/cord-profile/templates/vtn-service.yaml.j2 b/roles/cord-profile/templates/vtn-service.yaml.j2
index bcbd830..eab7961 100644
--- a/roles/cord-profile/templates/vtn-service.yaml.j2
+++ b/roles/cord-profile/templates/vtn-service.yaml.j2
@@ -1,4 +1,3 @@
-
{#
Copyright 2017-present Open Networking Foundation
@@ -15,7 +14,6 @@
limitations under the License.
#}
-
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
@@ -33,7 +31,7 @@
kind: onos
view_url: /admin/onos/onosservice/$id$/
no_container: true
- rest_hostname: onos-cord
+ rest_hostname: onos-cord.{{ site_suffix }}
rest_port: 8182
replaces: service_ONOS_CORD
@@ -47,12 +45,12 @@
sshUser: root
sshKeyFile: /root/node_key
sshPort: 22
- xosEndpoint: xos-chameleon:{{ xos_chameleon_port }}
+ xosEndpoint: xos-chameleon.{{ site_suffix }}:{{ xos_chameleon_port }}
xosUser: {{ xos_admin_user }}
xosPassword: {{ xos_admin_pass }}
replaces: service_vtn
vtnAPIVersion: 2
- controllerPort: onos-cord:6654
+ controllerPort: onos-cord.{{ site_suffix }}:6654
VTN_ONOS_app:
type: tosca.nodes.ONOSVTNApp
@@ -64,7 +62,7 @@
node: service#vtn
relationship: tosca.relationships.UsedByService
properties:
- install_dependencies: http://mavenrepo:8080/repository/org/opencord/cord-config/{{ cord_config_app_version }}/cord-config-{{ cord_config_app_version }}.oar,http://mavenrepo:8080/repository/org/opencord/vtn/{{ cord_vtn_app_version }}/vtn-{{ cord_vtn_app_version }}.oar
+ install_dependencies: {{ onos_mavenrepo_url }}/repository/org/opencord/cord-config/{{ cord_config_app_version }}/cord-config-{{ cord_config_app_version }}.oar, {{ onos_mavenrepo_url }}/repository/org/opencord/vtn/{{ cord_vtn_app_version }}/vtn-{{ cord_vtn_app_version }}.oar
dependencies: org.onosproject.drivers, org.onosproject.drivers.ovsdb, org.onosproject.openflow-base, org.onosproject.ovsdb-base, org.onosproject.dhcp
autogenerate: vtn-network-cfg