X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fhelm%2Faaf%2Ftemplates%2Faaf-service.yaml;h=da1134ac4405e92e1850b03732b1da295e2f3700;hb=HEAD;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..da1134ac 100644
--- a/auth/helm/aaf/templates/aaf-service.yaml
+++ b/auth/helm/aaf/templates/aaf-service.yaml
@@ -25,14 +25,14 @@ apiVersion: v1
 metadata:
   name: aaf-service
 spec:
+  type: NodePort
   selector:
     app: aaf-service
-  type: NodePort
   ports:
-    - name: aaf-service
+    - name: {{.Values.services.service.fqdn}}
       protocol: TCP
-      port: 8100
-      NodePort: 30080
+      nodePort: {{.Values.services.service.public_port}}
+      port: {{.Values.services.service.internal_port}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -41,7 +41,7 @@ metadata:
   labels:
     app: aaf-service
 spec:
-  replicas: 1
+  replicas: {{ .Values.services.service.replicas }}
   selector:
     matchLabels:
       app: aaf-service
@@ -51,43 +51,82 @@ spec:
         app: aaf-service
     spec:
       volumes:
-      - name: {{ .Chart.Name }}-config-vol
+      - name: aaf-config-vol
+        persistentVolumeClaim:
+          claimName: aaf-config-pvc
+      - name: aaf-status-vol
         persistentVolumeClaim:
-        claimName: {{ .Chart.Name }}-config-pvc
-      #- name: {{ .Chart.Name }}-config-vol
-      #  emptyDir: {}
+          claimName: aaf-status-pvc
       initContainers:
-        - name: {{ .Chart.Name }}-config-container
+        - 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/aaf/status
+            name: aaf-status-vol
+          - mountPath: /opt/app/osaaf
+            name: aaf-config-vol
+        - name: aaf-config-container
           image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
           imagePullPolicy: IfNotPresent
+          command: ["bash","-c","/opt/app/aaf_config/bin/agent.sh"]
           volumeMounts:
             - mountPath: "/opt/app/osaaf"
-              name: {{ .Chart.Name }}-config-vol
+              name: aaf-config-vol
+            - mountPath: "/opt/app/aaf/status"
+              name: aaf-status-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
-              value: "aaf-cass"
-      containers:
+            - name: aaf_env
+              value: "{{ .Values.services.aaf_env }}"
+            - name: aaf_id
+              value: "{{ .Values.services.aaf_id }}"
+            - name: aaf_locate_url
+              value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
+            - name: aaf_locator_container
+              value: "helm"
+            - name: aaf_locator_container_ns
+              value: "{{ .Release.Namespace }}"
+            - name: aaf_locator_fqdn
+              value: "{{.Values.services.fqdn}}"
+            - name: aaf_locator_public_fqdn
+              value: "{{.Values.services.public_fqdn}}"
+            - name: cadi_latitude
+              value: "{{ .Values.services.cadi_latitude }}"
+            - name: cadi_longitude
+              value: "{{ .Values.services.cadi_longitude }}"
+            - name: cm_always_ignore_ips
+              value: "true"
+            - name: CASSANDRA_CLUSTER
+              value: "{{.Values.services.cass.fqdn}}.{{.Release.Namespace }}"
+#            - name: CASSANDRA_USER
+#              value: ""
+#            - name: CASSANDRA_PASSWORD
+#              value: ""
+#           - name: CASSANDRA_PORT
+#              value: ""
 ###
 ### AAF-SERVICE
 ###
-      - name: {{ .Chart.Name }}-service
-        image: {{ .Values.image.repository }}onap/aaf/aaf_service:{{ .Values.image.version }}
+      containers:
+      - name: aaf-service
+        image: {{ .Values.image.repository }}onap/aaf/aaf_core:{{ .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 nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }} aaf-cass && exec bin/service"]
         volumeMounts:
-          -  mountPath: "/opt/app/osaaf"
-             name: {{ .Chart.Name }}-config-vol
+        -  mountPath: "/opt/app/osaaf"
+           name: aaf-config-vol
+        -  mountPath: "/opt/app/aaf/status"
+           name: aaf-status-vol
         ports:
         - name: service
           protocol: TCP
-          containerPort: 8100
+          containerPort: {{.Values.services.service.internal_port}}
+