CORD-3207 Make ONOS and Kafka service names configurable
Change-Id: I022dfce94a1d8b25662bbcc3610a4a4175804c85
diff --git a/xos-profiles/base-openstack/requirements.yaml b/xos-profiles/base-openstack/requirements.yaml
index 4c465e3..de4507b 100644
--- a/xos-profiles/base-openstack/requirements.yaml
+++ b/xos-profiles/base-openstack/requirements.yaml
@@ -16,7 +16,7 @@
dependencies:
- name: onos-service
- version: 2.0.0
+ version: 2.0.1
repository: file://../../xos-services/onos-service
- name: openstack
version: 1.0.0
diff --git a/xos-profiles/rcord-fc/requirements.yaml b/xos-profiles/rcord-fc/requirements.yaml
index f0684d9..a843bb4 100644
--- a/xos-profiles/rcord-fc/requirements.yaml
+++ b/xos-profiles/rcord-fc/requirements.yaml
@@ -18,13 +18,13 @@
version: 1.0.0
repository: file://../../xos-services/rcord
- name: onos-service
- version: 2.0.0
+ version: 2.0.1
repository: file://../../xos-services/onos-service
- name: fabric
version: 2.0.0
repository: file://../../xos-services/fabric
- name: volt
- version: 2.0.0
+ version: 2.0.1
repository: file://../../xos-services/volt
- name: fabric-crossconnect
version: 1.0.0
diff --git a/xos-profiles/rcord-lite/requirements.yaml b/xos-profiles/rcord-lite/requirements.yaml
index 262f9c0..3209196 100644
--- a/xos-profiles/rcord-lite/requirements.yaml
+++ b/xos-profiles/rcord-lite/requirements.yaml
@@ -18,13 +18,13 @@
version: 1.0.0
repository: file://../../xos-services/rcord
- name: onos-service
- version: 2.0.0
+ version: 2.0.1
repository: file://../../xos-services/onos-service
- name: fabric
version: 2.0.0
repository: file://../../xos-services/fabric
- name: volt
- version: 2.0.0
+ version: 2.0.1
repository: file://../../xos-services/volt
- name: vsg-hw
version: 1.0.0
diff --git a/xos-services/onos-service/Chart.yaml b/xos-services/onos-service/Chart.yaml
index e82959b..0a1c44c 100644
--- a/xos-services/onos-service/Chart.yaml
+++ b/xos-services/onos-service/Chart.yaml
@@ -15,4 +15,4 @@
description: A Helm chart for XOS's "onos-service" service, which configures ONOS
name: onos-service
-version: 2.0.0
+version: 2.0.1
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:
diff --git a/xos-services/onos-service/values.yaml b/xos-services/onos-service/values.yaml
index 7d9fcc5..eeadf06 100644
--- a/xos-services/onos-service/values.yaml
+++ b/xos-services/onos-service/values.yaml
@@ -32,6 +32,11 @@
cordConfigAppURL: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/cord-config/1.4.0/cord-config-1.4.0.oar"
vtnAppURL: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/vtn/1.6.0/vtn-1.6.0.oar"
+onosCordRestService: "onos-cord-ui.default.svc.cluster.local"
+onosVolthaRestService: "onos-voltha-ui.voltha.svc.cluster.local"
+onosFabricRestService: "onos-fabric-ui.default.svc.cluster.local"
+kafkaService: "cord-kafka.default.svc.cluster.local"
+
resources: {}
nodeSelector: {}
diff --git a/xos-services/simpleexampleservice/templates/_helpers.tpl b/xos-services/simpleexampleservice/templates/_helpers.tpl
index d1fb889..3307f88 100644
--- a/xos-services/simpleexampleservice/templates/_helpers.tpl
+++ b/xos-services/simpleexampleservice/templates/_helpers.tpl
@@ -53,7 +53,7 @@
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
event_bus:
- endpoint: cord-kafka
+ endpoint: {{ .Values.kafkaService | quote }}
kind: kafka
required_models:
- SimpleExampleService
diff --git a/xos-services/simpleexampleservice/values.yaml b/xos-services/simpleexampleservice/values.yaml
index ea818a0..f985089 100644
--- a/xos-services/simpleexampleservice/values.yaml
+++ b/xos-services/simpleexampleservice/values.yaml
@@ -29,6 +29,8 @@
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
+kafkaService: "cord-kafka"
+
resources: {}
nodeSelector: {}
diff --git a/xos-services/volt/Chart.yaml b/xos-services/volt/Chart.yaml
index b8a6777..e91e494 100644
--- a/xos-services/volt/Chart.yaml
+++ b/xos-services/volt/Chart.yaml
@@ -15,4 +15,4 @@
name: volt
description: A Helm chart for XOS's "olt-service" service
-version: 2.0.0
+version: 2.0.1
diff --git a/xos-services/volt/templates/_helpers.tpl b/xos-services/volt/templates/_helpers.tpl
index a19e6f7..c18ccb4 100644
--- a/xos-services/volt/templates/_helpers.tpl
+++ b/xos-services/volt/templates/_helpers.tpl
@@ -53,7 +53,7 @@
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
event_bus:
- endpoint: cord-kafka
+ endpoint: {{ .Values.kafkaService | quote }}
kind: kafka
logging:
version: 1
diff --git a/xos-services/volt/values.yaml b/xos-services/volt/values.yaml
index 26b5f7e..2f1edb4 100644
--- a/xos-services/volt/values.yaml
+++ b/xos-services/volt/values.yaml
@@ -29,6 +29,8 @@
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
+kafkaService: "cord-kafka"
+
resources: {}
nodeSelector: {}