Add ability to configure ONOS rest port in mcord-services
Change-Id: I1b5500ed4f2c2e5fce541d9fed29f44dffb10a95
diff --git a/xos-profiles/mcord-services/Chart.yaml b/xos-profiles/mcord-services/Chart.yaml
index 104ad3e..ce02950 100644
--- a/xos-profiles/mcord-services/Chart.yaml
+++ b/xos-profiles/mcord-services/Chart.yaml
@@ -17,7 +17,7 @@
name: mcord-services
description: A Helm chart for the "mcord-services" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.1.8
+version: 1.1.9
# xosproject/tosca-loader version
appVersion: 1.3.1
diff --git a/xos-profiles/mcord-services/requirements.yaml b/xos-profiles/mcord-services/requirements.yaml
index 7738014..5216b11 100644
--- a/xos-profiles/mcord-services/requirements.yaml
+++ b/xos-profiles/mcord-services/requirements.yaml
@@ -20,6 +20,7 @@
- name: onos-service
version: 2.1.3
repository: file://../../xos-services/onos-service
+ condition: fabric.enabled, progran.enabled
- name: fabric
version: 2.2.2
repository: file://../../xos-services/fabric
diff --git a/xos-profiles/mcord-services/templates/_tosca.tpl b/xos-profiles/mcord-services/templates/_tosca.tpl
index 353a6cc..0bc8be4 100644
--- a/xos-profiles/mcord-services/templates/_tosca.tpl
+++ b/xos-profiles/mcord-services/templates/_tosca.tpl
@@ -31,8 +31,8 @@
properties:
name: onos
kind: data
- rest_hostname: {{ .onosFabricRestService | quote }}
- rest_port: 8181
+ rest_hostname: {{ .onosFabricRestHost | quote }}
+ rest_port: {{ .onosFabricRestPort }}
onos_app#segmentrouting:
type: tosca.nodes.ONOSApp
@@ -82,8 +82,8 @@
properties:
name: onos-progran
kind: data
- rest_hostname: {{ .onosProgranRestService | quote }}
- rest_port: 8181
+ rest_hostname: {{ .onosProgranRestHost | quote }}
+ rest_port: {{ .onosProgranRestPort }}
onos_app#progran:
type: tosca.nodes.ONOSApp
diff --git a/xos-profiles/mcord-services/values.yaml b/xos-profiles/mcord-services/values.yaml
index adca154..95b96be 100644
--- a/xos-profiles/mcord-services/values.yaml
+++ b/xos-profiles/mcord-services/values.yaml
@@ -33,8 +33,10 @@
xosAdminPassword: "letmein"
# ONOS
-onosFabricRestService: "onos-ui.default.svc.cluster.local"
-onosProgranRestService: "onos-progran-ui.default.svc.cluster.local"
+onosFabricRestHost: "onos-ui.default.svc.cluster.local"
+onosFabricRestPort: 8181
+onosProgranRestHost: "onos-progran-ui.default.svc.cluster.local"
+onosProgranRestPort: 8181
# Services
fabric: