[SEBA-723] Removing ONOS parameters from vOLT Service
Change-Id: I03a6b118917e72dd7b1cdbf0fde5eaff18a3023b
diff --git a/.gitignore b/.gitignore
index ba1b12c..b2fad50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
# child repos (defined in the repo manifest)
macro/*
+helm-repo-tools/*
# ignore dependent chart dirs
xos-core/charts
diff --git a/xos-profiles/rcord-lite/Chart.yaml b/xos-profiles/rcord-lite/Chart.yaml
index 2461242..fb62672 100644
--- a/xos-profiles/rcord-lite/Chart.yaml
+++ b/xos-profiles/rcord-lite/Chart.yaml
@@ -16,7 +16,7 @@
name: rcord-lite
description: A Helm chart for XOS's "rcord-lite" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.1.2
+version: 1.1.3
# xosproject/tosca-loader version
appVersion: 1.3.0
diff --git a/xos-profiles/rcord-lite/requirements.yaml b/xos-profiles/rcord-lite/requirements.yaml
index 77a9067..05303e0 100644
--- a/xos-profiles/rcord-lite/requirements.yaml
+++ b/xos-profiles/rcord-lite/requirements.yaml
@@ -24,7 +24,7 @@
version: 2.2.0
repository: file://../../xos-services/fabric
- name: volt
- version: 2.2.2
+ version: 2.2.3
repository: file://../../xos-services/volt
- name: vsg-hw
version: 1.1.0
diff --git a/xos-profiles/seba-services/Chart.yaml b/xos-profiles/seba-services/Chart.yaml
index 299ea43..c450f1b 100644
--- a/xos-profiles/seba-services/Chart.yaml
+++ b/xos-profiles/seba-services/Chart.yaml
@@ -17,7 +17,7 @@
name: seba-services
description: A Helm chart for XOS's "SEBA" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.2.4
+version: 1.2.5
# xosproject/tosca-loader version
appVersion: 1.3.1
diff --git a/xos-profiles/seba-services/requirements.yaml b/xos-profiles/seba-services/requirements.yaml
index 8bcc949..ce9746f 100644
--- a/xos-profiles/seba-services/requirements.yaml
+++ b/xos-profiles/seba-services/requirements.yaml
@@ -26,7 +26,7 @@
repository: file://../../xos-services/fabric
condition: fabric.enabled
- name: volt
- version: 2.2.2
+ version: 2.2.3
repository: file://../../xos-services/volt
- name: fabric-crossconnect
version: 1.2.0
diff --git a/xos-profiles/seba-services/templates/_tosca.tpl b/xos-profiles/seba-services/templates/_tosca.tpl
index 712f176..26c4517 100644
--- a/xos-profiles/seba-services/templates/_tosca.tpl
+++ b/xos-profiles/seba-services/templates/_tosca.tpl
@@ -325,10 +325,10 @@
connect_method: none
requirements:
- subscriber_service:
- node: service#onos
+ node: service#volt
relationship: tosca.relationships.BelongsToOne
- provider_service:
- node: service#volt
+ node: service#onos
relationship: tosca.relationships.BelongsToOne
service_dependency#volt_fabric-crossconnect:
diff --git a/xos-services/volt/Chart.yaml b/xos-services/volt/Chart.yaml
index 83d783c..01eff1b 100644
--- a/xos-services/volt/Chart.yaml
+++ b/xos-services/volt/Chart.yaml
@@ -17,5 +17,5 @@
description: A Helm chart for XOS's "olt-service" service
icon: https://guide.opencord.org/logos/cord.svg
-version: 2.2.2
-appVersion: 2.2.1
+version: 2.2.3
+appVersion: 2.2.3
diff --git a/xos-services/volt/templates/_tosca.tpl b/xos-services/volt/templates/_tosca.tpl
index 9666e06..aede15f 100644
--- a/xos-services/volt/templates/_tosca.tpl
+++ b/xos-services/volt/templates/_tosca.tpl
@@ -29,8 +29,4 @@
kind: data
voltha_url: {{ .volthaRestService | quote }}
voltha_port: 8882
- onos_voltha_url: {{ .onosRestService | quote }}
- onos_voltha_port: 8181
- onos_voltha_user: karaf
- onos_voltha_pass: karaf
{{- end -}}
diff --git a/xos-services/volt/values.yaml b/xos-services/volt/values.yaml
index c91144c..69471ba 100644
--- a/xos-services/volt/values.yaml
+++ b/xos-services/volt/values.yaml
@@ -35,7 +35,6 @@
xosCoreService: "xos-core:50051"
volthaRestService: "voltha.voltha.svc.cluster.local"
-onosRestService: "onos-ui.default.svc.cluster.local"
kafkaService: "cord-kafka"
resources: {}