Setting shared services as optional requirements
Change-Id: I49e7b12707bef85b8f2530490114e97e3078a620
diff --git a/xos-profiles/mcord/Chart.yaml b/xos-profiles/mcord/Chart.yaml
index 6188a79..82a1b38 100644
--- a/xos-profiles/mcord/Chart.yaml
+++ b/xos-profiles/mcord/Chart.yaml
@@ -17,7 +17,7 @@
description: A Helm chart for the "mcord" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.3
+version: 1.0.4
# xosproject/tosca-loader version
appVersion: 1.1.5
diff --git a/xos-profiles/mcord/requirements.yaml b/xos-profiles/mcord/requirements.yaml
index c00bca2..299f986 100644
--- a/xos-profiles/mcord/requirements.yaml
+++ b/xos-profiles/mcord/requirements.yaml
@@ -20,9 +20,11 @@
- name: onos-service
version: 2.0.7
repository: file://../../xos-services/onos-service
+ condition: onos-service.enabled
- name: fabric
version: 2.1.9
repository: file://../../xos-services/fabric
+ condition: fabric.enabled
- name: mcord-subscriber
version: 2.0.4
repository: file://../../xos-services/mcord-subscriber
diff --git a/xos-profiles/mcord/templates/tosca-configmap.yaml b/xos-profiles/mcord/templates/tosca-configmap.yaml
index 0928483..4d92427 100644
--- a/xos-profiles/mcord/templates/tosca-configmap.yaml
+++ b/xos-profiles/mcord/templates/tosca-configmap.yaml
@@ -21,8 +21,10 @@
data:
010-onos-service.yaml: |
{{ include "mcord.onosTosca" .Values | indent 4 }}
+{{- if .Values.fabric.enabled }}
020-fabric-service.yaml: |
{{ include "fabric.serviceTosca" .Values.fabric | indent 4 }}
+{{- end }}
030-fixtures.yaml: |
{{ include "mcord.fixtureTosca" . | indent 4 }}
040-progran-service.yaml: |
diff --git a/xos-profiles/mcord/values.yaml b/xos-profiles/mcord/values.yaml
index 14342da..05149b2 100644
--- a/xos-profiles/mcord/values.yaml
+++ b/xos-profiles/mcord/values.yaml
@@ -39,3 +39,9 @@
onosRestService: "onos-ui.default.svc.cluster.local"
kafkaService: "cord-kafka.default.svc.cluster.local:9092"
+
+# whether to install or not this shared services
+fabric:
+ enabled: true
+onos-service:
+ enabled: true
\ No newline at end of file
diff --git a/xos-profiles/seba-services/Chart.yaml b/xos-profiles/seba-services/Chart.yaml
index fb5f69e..fa465c8 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.0.4
+version: 1.0.5
# xosproject/tosca-loader version
appVersion: 1.1.5
diff --git a/xos-profiles/seba-services/requirements.yaml b/xos-profiles/seba-services/requirements.yaml
index 184ea0f..0d73f27 100644
--- a/xos-profiles/seba-services/requirements.yaml
+++ b/xos-profiles/seba-services/requirements.yaml
@@ -20,9 +20,11 @@
- name: onos-service
version: 2.0.7
repository: file://../../xos-services/onos-service
+ condition: onos-service.enabled
- name: fabric
version: 2.1.9
repository: file://../../xos-services/fabric
+ condition: fabric.enabled
- name: volt
version: 2.1.10
repository: file://../../xos-services/volt
diff --git a/xos-profiles/seba-services/templates/tosca-configmap.yaml b/xos-profiles/seba-services/templates/tosca-configmap.yaml
index 4885b11..2ca2edd 100644
--- a/xos-profiles/seba-services/templates/tosca-configmap.yaml
+++ b/xos-profiles/seba-services/templates/tosca-configmap.yaml
@@ -29,7 +29,9 @@
{{ include "fabric-crossconnect.serviceTosca" (index .Values "fabric-crossconnect") | indent 4 }}
061-onos-service.yaml: |
{{ include "seba-services.onosTosca" .Values | indent 4 }}
+{{- if .Values.fabric.enabled }}
070-fabric-service.yaml: |
{{ include "fabric.serviceTosca" .Values.fabric | indent 4 }}
+{{- end }}
300-service-graph.yaml: |
{{ include "seba-services.serviceGraphTosca" . | indent 4 }}
diff --git a/xos-profiles/seba-services/values.yaml b/xos-profiles/seba-services/values.yaml
index 365a796..ec65381 100644
--- a/xos-profiles/seba-services/values.yaml
+++ b/xos-profiles/seba-services/values.yaml
@@ -57,3 +57,9 @@
onosRestService: "onos-ui.default.svc.cluster.local"
kafkaService: "cord-kafka.default.svc.cluster.local:9092"
+
+# whether to install or not this shared services
+fabric:
+ enabled: true
+onos-service:
+ enabled: true
\ No newline at end of file