Refactor FIXMEs in vFW_CDS_CNF use case

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

diff --git a/heat/vFW_CNF_CDS/templates/helm/firewall/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/firewall/templates/deployment.yaml
deleted file mode 100644 (file)
index 8de03e1..0000000
--- a/heat/vFW_CNF_CDS/templates/helm/firewall/templates/deployment.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Values.vfw_name_0 }}
-  labels:
-    release: {{ .Release.Name }}
-    app: {{ .Values.vnf_name }}
-    chart: {{ .Chart.Name }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ .Values.vnf_name }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ .Values.vnf_name }}
-        release: {{ .Release.Name }}
-      annotations:
-        VirtletLibvirtCPUSetting: |
-          mode: host-model
-        VirtletSSHKeySource: "secret/{{ .Values.key_name }}"
-        VirtletCloudInitUserData: |
-          ssh_pwauth: True #FIXME Remove after troubleshooting
-          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
-        k8s.v1.cni.cncf.io/networks: "{{ .Values.vnf_name }}-ovn-attachment"
-        k8s.plugin.opnfv.org/nfn-network: | 
-            { "type": "ovn4nfv",
-              "interface": [
-                { "name": {{ .Values.int_private1_net_id | quote }},
-                  "ipAddress": {{ .Values.vfw_int_private1_ip_0 | quote }},
-                  "interface": "eth1",
-                  "defaultGateway": "false" },
-                { "name": {{ .Values.int_private2_net_id | quote }},
-                  "ipAddress": {{ .Values.vfw_int_private2_ip_0 | quote }},
-                  "interface": "eth2",
-                  "defaultGateway": "false" },
-                { "name": {{ .Values.onap_private_net_id | quote }},
-                  "ipAddress": {{ .Values.vfw_onap_private_ip_0 | quote }},
-                  "interface": "eth3",
-                  "defaultGateway": "false" }
-              ]
-            }
-        kubernetes.io/target-runtime: virtlet.cloud
-    spec:
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-            - matchExpressions:
-              - key: extraRuntime
-                operator: In
-                values:
-                - virtlet
-      containers:
-      - name: {{ .Chart.Name }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        tty: true
-        stdin: true
-        envFrom:
-        - configMapRef:
-            name: {{ .Values.vfw_name_0 }}-configmap
-        resources:
-          limits:
-            memory: {{ .Values.resources.limits.memory }}