COMAC-237,COMAC-255 Refactor mcord profile
- Rename mcord to mcord-services
- Use the onos chart instead of onos-progran chart for bring up progran on onos
No need to manually restart progran app after deploying anymore
- Make onos rest URL configurable for xos-services/progran service
- Enable and disable fabric conditionally
- Change service dependency
Change-Id: Icc20305349b78bd5b16e6e80ff1621ced733f69d
diff --git a/xos-services/progran/Chart.yaml b/xos-services/progran/Chart.yaml
index 3c6a715..d159a0b 100644
--- a/xos-services/progran/Chart.yaml
+++ b/xos-services/progran/Chart.yaml
@@ -17,5 +17,5 @@
description: A Helm chart for XOS's "progran" service
icon: https://guide.opencord.org/logos/cord.svg
-version: 2.0.7
+version: 2.0.8
appVersion: 2.0.5
diff --git a/xos-services/progran/templates/_tosca.tpl b/xos-services/progran/templates/_tosca.tpl
index f952daa..de1d575 100644
--- a/xos-services/progran/templates/_tosca.tpl
+++ b/xos-services/progran/templates/_tosca.tpl
@@ -29,6 +29,6 @@
type: tosca.nodes.ProgranService
properties:
name: progran
- onos_address: onos-progran-ui
+ onos_address: {{ .onosProgranRestService | quote }}
onos_port: "8181"
{{- end -}}
diff --git a/xos-services/progran/values.yaml b/xos-services/progran/values.yaml
index c300941..a53fc02 100644
--- a/xos-services/progran/values.yaml
+++ b/xos-services/progran/values.yaml
@@ -33,6 +33,8 @@
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
+onosProgranRestService: "onos-ui.default.svc.cluster.local"
+
resources: {}
nodeSelector: {}