X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fhelm%2Faaf%2Ftemplates%2Faaf-fs.yaml;h=999b8d136e03e0c677c1516bb5d559f06519f6f2;hb=d86e3224e6a5af2bd2b713f93bea5e6677d3ebc2;hp=4dcfdcf522f08749e3be670572b8d0f9a69f08b8;hpb=575c9820dffbfee3311e19a5f64e64b98c2ed5f8;p=aaf%2Fauthz.git

diff --git a/auth/helm/aaf/templates/aaf-fs.yaml b/auth/helm/aaf/templates/aaf-fs.yaml
index 4dcfdcf5..999b8d13 100644
--- a/auth/helm/aaf/templates/aaf-fs.yaml
+++ b/auth/helm/aaf/templates/aaf-fs.yaml
@@ -1,3 +1,22 @@
+#########
+##  ============LICENSE_START====================================================
+##  org.onap.aaf
+##  ===========================================================================
+##  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+##  ===========================================================================
+##  Licensed under the Apache License, Version 2.0 (the "License");
+##  you may not use this file except in compliance with the License.
+##  You may obtain a copy of the License at
+##
+##       http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+##  ============LICENSE_END====================================================
+##
 ###
 ### AAF-FS
 ###
@@ -13,7 +32,7 @@ spec:
     - name: aaf-fs
       protocol: TCP
       port: 8096
-      NodePort: 30085
+      nodePort: 30085
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -22,7 +41,7 @@ metadata:
   labels:
     app: aaf-fs
 spec:
-  replicas: 1
+  replicas: 0
   selector:
     matchLabels:
       app: aaf-fs
@@ -34,27 +53,42 @@ spec:
       volumes:
         # Use this Pod Sharing dir to declare various States of starting
       - name: {{ .Chart.Name }}-config-vol
-        emptyDir: {}
+        persistentVolumeClaim:
+          claimName: {{ .Chart.Name }}-config-pvc
+      - name: {{ .Chart.Name }}-status-vol
+        persistentVolumeClaim:
+          claimName: {{ .Chart.Name }}-status-pvc
       initContainers:
         - name: {{ .Chart.Name }}-config-container
           image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
           imagePullPolicy: IfNotPresent
+          command: ["bash","/opt/app/aaf_config/bin/agent.sh"]
           volumeMounts:
             - mountPath: "/opt/app/osaaf"
               name: {{ .Chart.Name }}-config-vol
           env:
             - name: AAF_ENV
               value: "{{ .Values.cadi.aaf_env }}"
-            - name: AAF_REGISTER_AS
-              value: "aaf-fs"
-            - name: AAF_LOCATOR_AS
-              value: "{{ .Values.cadi.aaf_locate_as }}"
             - name: LATITUDE
               value: "{{ .Values.cadi.cadi_latitude }}"
             - name: LONGITUDE
               value: "{{ .Values.cadi.cadi_longitude }}"
-            - name: CASS_HOST
+            - name: aaf_locator_container
+              value: "helm"
+            - name: aaf_locator_fqdn
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: aaf_locate_url
+              value: "https://aaf-locate:8095"
+            - name: CASSANDRA_CLUSTER
               value: "aaf-cass"
+#            - name: CASSANDRA_USER
+#              value: ""
+#            - name: CASSANDRA_PASSWORD
+#              value: ""
+#           - name: CASSANDRA_PORT
+#              value: ""
       containers:
 ###
 ### AAF-FS
@@ -62,11 +96,25 @@ spec:
       - name: {{ .Chart.Name }}-fs
         image: {{ .Values.image.repository }}onap/aaf/aaf_fs:{{ .Values.image.version }}
         imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_fs","sleep","50", "cd /opt/app/aaf;bin/fs"]
+        command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-fs aaf-locate && exec bin/fs"]
         volumeMounts:
-          -  mountPath: "/opt/app/osaaf"
-             name: {{ .Chart.Name }}-config-vol
+        - mountPath: "/opt/app/osaaf"
+          name: {{ .Chart.Name }}-config-vol
+        - mountPath: "/opt/app/aaf/status"
+          name: {{ .Chart.Name }}-status-vol
         ports:
         - name: aaf-fs
           protocol: TCP
           containerPort: 8096
+        env:
+            - name: aaf_locator_container
+              value: "helm"
+            - name: aaf_locator_container_ns
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: aaf_locate_url
+              value: "https://aaf-locate.onap:8095"
+            - name: aaf_locator_public_hostname
+              value: "aaf.osaaf.org"
+