X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fhelm%2Faaf%2Ftemplates%2Faaf-fs.yaml;h=e3973af04d2421a71ac779f44d61f568b840c354;hb=48bcfb9d4b03ac3e2e6915f7bdf72599c8794d43;hp=f0c6e8e54498a48a6db8e196d0b872c7658f0bb3;hpb=d087d3ddd2829ced1d2ffccc5147c377cbcc92cb;p=aaf%2Fauthz.git

diff --git a/auth/helm/aaf/templates/aaf-fs.yaml b/auth/helm/aaf/templates/aaf-fs.yaml
index f0c6e8e5..e3973af0 100644
--- a/auth/helm/aaf/templates/aaf-fs.yaml
+++ b/auth/helm/aaf/templates/aaf-fs.yaml
@@ -59,42 +59,35 @@ spec:
         persistentVolumeClaim:
           claimName: aaf-status-pvc
       initContainers:
+        - command:
+            - /bin/sh
+            - -c
+            - |
+              chmod -R 775 /opt/app/aaf/status
+              chown -R 1000:1000 /opt/app/aaf/status
+              chmod -R 775 /opt/app/osaaf
+              chown -R 1000:1000 /opt/app/osaaf
+          image: busybox:1.28
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          name: init-sysctl
+          volumeMounts:
+            - mountPath: /opt/app/osaaf
+              name: aaf-config-vol
+            - mountPath: /opt/app/aaf/status
+              name: aaf-status-vol
         - name: aaf-config-container
           image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
           imagePullPolicy: IfNotPresent
-          command: ["bash","/opt/app/aaf_config/bin/agent.sh"]
+          command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-locate rm"]
           volumeMounts:
-            - mountPath: "/opt/app/osaaf"
-              name: aaf-config-vol
-          env:
-            - name: AAF_ENV
-              value: "{{ .Values.services.aaf_env }}"
-            - name: LATITUDE
-              value: "{{ .Values.services.cadi_latitude }}"
-            - name: LONGITUDE
-              value: "{{ .Values.services.cadi_longitude }}"
-            - name: aaf_locator_container
-              value: "helm"
-            - name: aaf_locator_fqdn
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-            - name: aaf_locate_url
-              value: "https://{{.Values.services.locate.fqdn}}.{{.Values.services.ns}}:{{.Values.services.locate.internal_port}}"
-            - name: CASSANDRA_CLUSTER
-              value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
-#            - name: CASSANDRA_USER
-#              value: ""
-#            - name: CASSANDRA_PASSWORD
-#              value: ""
-#           - name: CASSANDRA_PORT
-#              value: ""
+            - mountPath: "/opt/app/aaf/status"
+              name: aaf-status-vol
       containers:
 ###
 ### AAF-FS
 ###
       - name: aaf-fs
-        image: {{ .Values.image.repository }}onap/aaf/aaf_fs:{{ .Values.image.version }}
+        image: {{ .Values.image.repository }}onap/aaf/aaf_core:{{ .Values.image.version }}
         imagePullPolicy: IfNotPresent
         command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-fs aaf-locate && exec bin/fs"]
         volumeMounts:
@@ -110,9 +103,7 @@ spec:
             - name: aaf_locator_container
               value: "helm"
             - name: aaf_locator_container_ns
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+              value: {{ .Release.Namespace }}
             - name: aaf_locate_url
               value: "https://aaf-locate.onap:8095"
             - name: aaf_locator_public_fqdn