Reducing duplicated values on values files for SiaB
Reduced the amount of duplicated values between seba-ponsim values file.
To deploy, for example, the latest of seba-ponsim, now both seba-ponsim.yaml and seba-pomsim-latest.yaml values files need to be used with the specified order.
Makefile for SiaB is modified accordingly in the patch https://gerrit.opencord.org/#/c/16743/.
Also:
- removed stratumEnabled value from Mininet chart and added mnStratumSwitchCount
- moved bngAppUrl and bngAppVersion values on root of values file
Change-Id: I26b8e91f868646adc06f2c1feea72b333defd487
diff --git a/xos-profiles/seba-services/Chart.yaml b/xos-profiles/seba-services/Chart.yaml
index 5f30e70..aa31042 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.4.2
+version: 1.4.3
# xosproject/tosca-loader version
appVersion: 1.3.1
diff --git a/xos-profiles/seba-services/templates/_tosca.tpl b/xos-profiles/seba-services/templates/_tosca.tpl
index cb4a8e8..922fbc6 100644
--- a/xos-profiles/seba-services/templates/_tosca.tpl
+++ b/xos-profiles/seba-services/templates/_tosca.tpl
@@ -178,10 +178,10 @@
onos_app#bng:
type: tosca.nodes.ONOSApp
properties:
- name: {{ .bng.embedded.bngAppId }}
- app_id: {{ .bng.embedded.bngAppId }}
- url: {{ .bng.embedded.bngAppUrl }}
- version: {{ .bng.embedded.bngAppVersion }}
+ name: org.opencord.bng
+ app_id: org.opencord.bng
+ url: {{ .bngAppUrl }}
+ version: {{ .bngAppVersion }}
dependencies: {{ .fabric.stratum.pipeconfAppId }}, org.opencord.kafka, org.opencord.sadis
requirements:
- owner:
diff --git a/xos-profiles/seba-services/values.yaml b/xos-profiles/seba-services/values.yaml
index 551ae3f..eccad87 100644
--- a/xos-profiles/seba-services/values.yaml
+++ b/xos-profiles/seba-services/values.yaml
@@ -52,6 +52,9 @@
kafkaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.0.0/kafka-2.0.0.oar"
kafkaAppVersion: "2.0.0"
+bngAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/bng/1.0.0/bng-1.0.0.oar"
+bngAppVersion: "1.0.0"
+
onosRestService: "onos-ui.default.svc.cluster.local"
kafkaService: "cord-kafka.default.svc.cluster.local:9092"
@@ -81,6 +84,3 @@
enabled: true
embedded:
enabled: false
- bngAppId: "org.opencord.bng"
- bngAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/bng/1.0.0/bng-1.0.0.oar"
- bngAppVersion: "1.0.0"