X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fhelm%2Faaf%2Ftemplates%2Faaf-service.yaml;h=e6d6d09bf8e30ebefe238796778ff2944641f92d;hb=d86e3224e6a5af2bd2b713f93bea5e6677d3ebc2;hp=a91929e97e6518ec675f1a92b913d111f6992350;hpb=7a1817bf3cf3c40c6c33f673ddc46c3f115cc3bc;p=aaf%2Fauthz.git

diff --git a/auth/helm/aaf/templates/aaf-service.yaml b/auth/helm/aaf/templates/aaf-service.yaml
index a91929e9..e6d6d09b 100644
--- a/auth/helm/aaf/templates/aaf-service.yaml
+++ b/auth/helm/aaf/templates/aaf-service.yaml
@@ -25,14 +25,15 @@ apiVersion: v1
 metadata:
   name: aaf-service
 spec:
+  type: NodePort
   selector:
     app: aaf-service
-  type: NodePort
   ports:
     - name: aaf-service
       protocol: TCP
+      nodePort: 30080
       port: 8100
-      NodePort: 30080
+      targetPort: 8100
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -41,7 +42,7 @@ metadata:
   labels:
     app: aaf-service
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicas.service }}
   selector:
     matchLabels:
       app: aaf-service
@@ -53,29 +54,43 @@ spec:
       volumes:
       - name: {{ .Chart.Name }}-config-vol
         persistentVolumeClaim:
-        claimName: {{ .Chart.Name }}-config-pvc
-      #- name: {{ .Chart.Name }}-config-vol
-      #  emptyDir: {}
+          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-service"
-            - 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_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"
+            - name: CASSANDRA_CLUSTER
               value: "aaf-cass"
+#            - name: CASSANDRA_USER
+#              value: ""
+#            - name: CASSANDRA_PASSWORD
+#              value: ""
+#           - name: CASSANDRA_PORT
+#              value: ""
       containers:
 ###
 ### AAF-SERVICE
@@ -83,11 +98,14 @@ spec:
       - name: {{ .Chart.Name }}-service
         image: {{ .Values.image.repository }}onap/aaf/aaf_service:{{ .Values.image.version }}
         imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_service","sleep","50", "cd /opt/app/aaf;bin/service"]
+        command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-service aaf-cass && exec bin/service"]
         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: service
           protocol: TCP
           containerPort: 8100
+