[COMAC-132,COMAC-187] Fix typo: resdential to residential
Change-Id: I829afbb508da7c60bfec01bb54111f1137045ab3
diff --git a/xos-profiles/comac/Chart.yaml b/xos-profiles/comac/Chart.yaml
index c522ed5..7050bfc 100644
--- a/xos-profiles/comac/Chart.yaml
+++ b/xos-profiles/comac/Chart.yaml
@@ -17,7 +17,7 @@
name: comac
description: A Helm chart for the "COMAC" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.0.4
+version: 0.0.5
# xosproject/tosca-loader version
appVersion: 1.3.1
diff --git a/xos-profiles/comac/requirements.yaml b/xos-profiles/comac/requirements.yaml
index 3303b2e..25db857 100644
--- a/xos-profiles/comac/requirements.yaml
+++ b/xos-profiles/comac/requirements.yaml
@@ -17,7 +17,7 @@
- name: rcord
version: 1.0.16
repository: file://../../xos-services/rcord
- condition: resdentialService.enabled
+ condition: residentialService.enabled
- name: onos-service
version: 2.1.3
repository: file://../../xos-services/onos-service
@@ -32,19 +32,19 @@
- name: volt
version: 2.2.5
repository: file://../../xos-services/volt
- condition: resdentialService.enabled
+ condition: residentialService.enabled
- name: fabric-crossconnect
version: 1.2.2
repository: file://../../xos-services/fabric-crossconnect
- condition: resdentialService.enabled
+ condition: residentialService.enabled
- name: sadis-server
version: 1.0.4
repository: file://../../sadis-server
- condition: resdentialService.enabled
+ condition: residentialService.enabled
- name: att-workflow-driver
version: 1.1.2
repository: file://../../xos-services/att-workflow-driver
- condition: resdentialService.enabled
+ condition: residentialService.enabled
- name: vrouter
version: 2.1.0
repository: file://../../xos-services/vrouter
diff --git a/xos-profiles/comac/templates/_tosca.tpl b/xos-profiles/comac/templates/_tosca.tpl
index 42c0efb..7b0f000 100644
--- a/xos-profiles/comac/templates/_tosca.tpl
+++ b/xos-profiles/comac/templates/_tosca.tpl
@@ -36,7 +36,7 @@
rest_hostname: {{ .onosRestService | quote }}
rest_port: 8181
-{{- if $.resdentialService.enabled }}
+{{- if $.residentialService.enabled }}
onos_app#openflow-base:
type: tosca.nodes.ONOSApp
properties:
@@ -306,7 +306,7 @@
- custom_types/mcordsubscriberservice.yaml
- custom_types/onosservice.yaml
- custom_types/vrouterservice.yaml
-{{- if .Values.resdentialService.enabled }}
+{{- if .Values.residentialService.enabled }}
- custom_types/rcordservice.yaml
- custom_types/voltservice.yaml
- custom_types/fabriccrossconnectservice.yaml
@@ -343,7 +343,7 @@
name: mcord
must-exist: true
-{{- if .Values.resdentialService.enabled }}
+{{- if .Values.residentialService.enabled }}
service#rcord:
type: tosca.nodes.RCORDService
properties:
@@ -415,7 +415,7 @@
node: service#fabric
relationship: tosca.relationships.BelongsToOne
-{{- if .Values.resdentialService.enabled }}
+{{- if .Values.residentialService.enabled }}
service_dependency#rcord_volt:
type: tosca.nodes.ServiceDependency
properties:
diff --git a/xos-profiles/comac/templates/tosca-configmap.yaml b/xos-profiles/comac/templates/tosca-configmap.yaml
index 7e2cf06..f6fc35b 100644
--- a/xos-profiles/comac/templates/tosca-configmap.yaml
+++ b/xos-profiles/comac/templates/tosca-configmap.yaml
@@ -18,7 +18,7 @@
metadata:
name: comac-tosca
data:
-{{- if .Values.resdentialService.enabled }}
+{{- if .Values.residentialService.enabled }}
010-rcord-subscriber-service.yaml: |
{{ include "rcord.serviceTosca" .Values.rcord | indent 4 }}
020-volt-service.yaml: |
@@ -34,7 +34,7 @@
050-fabric-service.yaml: |
{{ include "fabric.serviceTosca" .Values.fabric | indent 4 }}
{{- end }}
-{{- if .Values.resdentialService.enabled }}
+{{- if .Values.residentialService.enabled }}
060-fixtures.yaml: |
{{ include "comac.basicFixturesTosca" . | indent 4 }}
{{- end }}
diff --git a/xos-profiles/comac/values.yaml b/xos-profiles/comac/values.yaml
index 6c6f44c..d68122b 100644
--- a/xos-profiles/comac/values.yaml
+++ b/xos-profiles/comac/values.yaml
@@ -60,7 +60,7 @@
att-workflow-driver:
kafkaService: "cord-platform-kafka"
-resdentialService:
+residentialService:
enabled: false
# whether to install or not this shared services