commit ebfcfeba76f65e5c6139b5b2170cff7cea06e933
author Andy Bavier <andy@onlab.us> Fri Jul 13 13:04:13 2018 -0700
committer Andy Bavier <andy@onlab.us> Tue Jul 24 08:33:12 2018 -0700
tree a43730c431665edf2aaa31f5bcac2ecfcc6be042
parent 83e6e92f86501db74c1c4e002f231a4dcf1b9991

CORD-3207 Make ONOS and Kafka service names configurable

Change-Id: I022dfce94a1d8b25662bbcc3610a4a4175804c85

xos-services/onos-service/templates/_tosca.tpl

diff --git a/xos-services/onos-service/templates/_tosca.tpl b/xos-services/onos-service/templates/_tosca.tpl
index c7623f7..da5acaa 100644
--- a/xos-services/onos-service/templates/_tosca.tpl
+++ b/xos-services/onos-service/templates/_tosca.tpl
@@ -27,7 +27,7 @@
       properties:
           name: ONOS_Fabric
           kind: platform
-          rest_hostname: onos-fabric-ui
+          rest_hostname: {{ .onosFabricRestService | quote }}
           rest_port: 8181
 
     onos_app#segmentrouting:
@@ -89,7 +89,7 @@
       properties:
           name: ONOS_CORD
           kind: platform
-          rest_hostname: onos-cord-ui
+          rest_hostname: {{ .onosCordRestService | quote }}
           rest_port: 8181
 
     onos_app#openflow:
@@ -147,17 +147,17 @@
    - custom_types/onosservice.yaml
    - custom_types/serviceinstanceattribute.yaml
 
-description: Configures the VTN ONOS service
+description: Configures the VOLTHA ONOS service
 
 topology_template:
   node_templates:
 
-    service#ONOS_CORD:
+    service#ONOS_VOLTHA:
       type: tosca.nodes.ONOSService
       properties:
           name: ONOS_VOLTHA
           kind: platform
-          rest_hostname: onos-voltha-ui.voltha.svc.cluster.local
+          rest_hostname: {{ .onosVolthaRestService | quote }}
           rest_port: 8181
 
     onos_app#olt:
@@ -168,7 +168,7 @@
         version: 1.4.0
       requirements:
         - owner:
-            node: service#ONOS_CORD
+            node: service#ONOS_VOLTHA
             relationship: tosca.relationships.BelongsToOne
 
     # CORD-Configuration
@@ -179,7 +179,7 @@
         value: >
           {
             "kafka" : {
-              "bootstrapServers" : "cord-kafka.default.svc.cluster.local:9092"
+              "bootstrapServers" : {{ .kafkaService | quote }}
             }
           }
       requirements: