Refactor FIXMEs in vFW_CDS_CNF use case

[demo.git] / heat / vFW_CNF_CDS / templates / helm / vfw / templates / deployment.yaml

diff --git a/heat/vFW_CNF_CDS/templates/helm/firewall/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
similarity index 85%
rename from heat/vFW_CNF_CDS/templates/helm/firewall/templates/deployment.yaml
rename to heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
index 8de03e1..4aa1861 100644 (file)
--- a/heat/vFW_CNF_CDS/templates/helm/firewall/templates/deployment.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
@@ -4,42 +4,36 @@ metadata:
   name: {{ .Values.vfw_name_0 }}
   labels:
     release: {{ .Release.Name }}
-    app: {{ .Values.vnf_name }}
+    app: {{ .Values.vfw_name_0 }}
     chart: {{ .Chart.Name }}
+    vnf-name: {{ .Values.vnf_name }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Values.vnf_name }}
+      app: {{ .Values.vfw_name_0 }}
       release: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ .Values.vnf_name }}
+        app: {{ .Values.vfw_name_0 }}
         release: {{ .Release.Name }}
+        vnf-name: {{ .Values.vnf_name }}
       annotations:
         VirtletLibvirtCPUSetting: |
           mode: host-model
-        VirtletSSHKeySource: "secret/{{ .Values.key_name }}"
         VirtletCloudInitUserData: |
-          ssh_pwauth: True #FIXME Remove after troubleshooting
+          ssh_pwauth: True
           users:
           - name: admin
             gecos: User
             primary-group: admin
             groups: users
             sudo: ALL=(ALL) NOPASSWD:ALL
-            # FIXME Remove after troubleshooting
             # Password is "testuser"
             passwd: "$6$rounds=4096$D6cf92nq$cgBveQHTP7IK3CIYTNkVJyzd0Vze6l1QlV9sWSXiTma2hOCTl7bFSh4nvK5qPMvNlnDtlIm03arG5Uh866E9w."
             lock_passwd: False
           runcmd:
-            #FIXME DEBUG START
-            - echo "ENV:"
-            - env
-            - echo "/etc/cloud/environment:"
-            - cat /etc/cloud/environment
-            #FIXME DEBUG END
             - 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