2 files changed, 10 insertions, 10 deletions
diff --git a/heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml
index 832afde7..6a38b5a5 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml
@@ -3,10 +3,10 @@ kind: ConfigMap
 metadata:
   name: {{ .Values.vfw_name_0 }}-configmap
   labels:
+    vnf-name: {{ .Values.vnf_name }}
+    vf-module-name: {{ .Values.vfw_name_0 }}
     release: {{ .Release.Name }}
-    app: {{ .Values.vfw_name_0 }}
     chart: {{ .Chart.Name }}
-    vnf-name: {{ .Values.vnf_name }}
 data:
   demo_artifacts_version: {{ .Values.demo_artifacts_version | quote }}
   dcae_collector_ip: {{ .Values.dcae_collector_ip | quote }}
@@ -14,4 +14,3 @@ data:
   vfw_private_ip_0: {{ .Values.vfw_int_private1_ip_0 | quote }}
   vsn_private_ip_0: {{ .Values.vsn_int_private2_ip_0 | quote }}
   protected_net_cidr: {{ .Values.int_private2_net_cidr | quote }}
-
diff --git a/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
index 4aa1861c..2205cf89 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
@@ -3,22 +3,23 @@ kind: Deployment
 metadata:
   name: {{ .Values.vfw_name_0 }}
   labels:
+    vnf-name: {{ .Values.vnf_name }}
+    vf-module-name: {{ .Values.vfw_name_0 }}
     release: {{ .Release.Name }}
-    app: {{ .Values.vfw_name_0 }}
     chart: {{ .Chart.Name }}
-    vnf-name: {{ .Values.vnf_name }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Values.vfw_name_0 }}
-      release: {{ .Release.Name }}
+      vnf-name: {{ .Values.vnf_name }}
+      vf-module-name: {{ .Values.vfw_name_0 }}
   template:
     metadata:
       labels:
-        app: {{ .Values.vfw_name_0 }}
-        release: {{ .Release.Name }}
         vnf-name: {{ .Values.vnf_name }}
+        vf-module-name: {{ .Values.vfw_name_0 }}
+        release: {{ .Release.Name }}
+        chart: {{ .Chart.Name }}
       annotations:
         VirtletLibvirtCPUSetting: |
           mode: host-model
@@ -37,7 +38,7 @@ spec:
             - wget -O firewall.sh https://git.onap.org/multicloud/k8s/plain/kud/tests/vFW/firewall
             - bash -c 'set -a; . /etc/cloud/environment; bash firewall.sh'
         VirtletRootVolumeSize: 5Gi
-        k8s.v1.cni.cncf.io/networks: "{{ .Values.vnf_name }}-ovn-attachment"
+        k8s.v1.cni.cncf.io/networks: "{{ .Values.net_attachment_definition }}"
         k8s.plugin.opnfv.org/nfn-network: | 
             { "type": "ovn4nfv",
               "interface": [