X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fhelm%2Faaf%2Ftemplates%2Faaf-oauth.yaml;h=ab21e3abd928eda0acfb2b18b63028bcaeac7d39;hb=HEAD;hp=f59a7d24ec01c92bc7659959cf7a426c7967f77f;hpb=3505a52ac853c134ecaf40f2977667de8770ec59;p=aaf%2Fauthz.git

diff --git a/auth/helm/aaf/templates/aaf-oauth.yaml b/auth/helm/aaf/templates/aaf-oauth.yaml
index f59a7d24..ab21e3ab 100644
--- a/auth/helm/aaf/templates/aaf-oauth.yaml
+++ b/auth/helm/aaf/templates/aaf-oauth.yaml
@@ -29,10 +29,10 @@ spec:
     app: aaf-oauth
   type: NodePort
   ports:
-    - name: aaf-oauth
+    - name: {{.Values.services.oauth.fqdn}}
       protocol: TCP
-      port: 8140
-      nodePort: 30082
+      port: {{.Values.services.oauth.internal_port}}
+      nodePort: {{.Values.services.oauth.public_port}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -41,7 +41,7 @@ metadata:
   labels:
     app: aaf-oauth
 spec:
-  replicas: 1
+  replicas: {{ .Values.services.oauth.replicas }}
   selector:
     matchLabels:
       app: aaf-oauth
@@ -52,64 +52,53 @@ spec:
     spec:
       volumes:
         # Use this Pod Sharing dir to declare various States of starting
-      - name: {{ .Chart.Name }}-config-vol
+      - name: aaf-config-vol
         persistentVolumeClaim:
-          claimName: {{ .Chart.Name }}-config-pvc
-      - name: {{ .Chart.Name }}-status-vol
+          claimName: aaf-config-pvc
+      - name: aaf-status-vol
         persistentVolumeClaim:
-          claimName: {{ .Chart.Name }}-status-pvc
+          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","/opt/app/aaf_config/bin/agent.sh"]
+          command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm"]
           volumeMounts:
-            - mountPath: "/opt/app/osaaf"
-              name: {{ .Chart.Name }}-config-vol
-          env:
-            - name: AAF_ENV
-              value: "{{ .Values.cadi.aaf_env }}"
-            - name: LATITUDE
-              value: "{{ .Values.cadi.cadi_latitude }}"
-            - name: LONGITUDE
-              value: "{{ .Values.cadi.cadi_longitude }}"
-            - 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: ""
+            - mountPath: "/opt/app/aaf/status"
+              name: aaf-status-vol
       containers:
 ###
 ### AAF-OAUTH
 ###
-      - name: {{ .Chart.Name }}-oauth
-        image: {{ .Values.image.repository }}onap/aaf/aaf_oauth:{{ .Values.image.version }}
+      - name: aaf-oauth
+        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-oauth aaf-service && exec bin/oauth"]
+        command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-oauth nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }} aaf-service && exec bin/oauth"]
         volumeMounts:
         - mountPath: "/opt/app/osaaf"
-          name: {{ .Chart.Name }}-config-vol
+          name: aaf-config-vol
         - mountPath: "/opt/app/aaf/status"
-          name: {{ .Chart.Name }}-status-vol
+          name: aaf-status-vol
         ports:
-        - name: aaf-oauth
+        - name: {{.Values.services.oauth.fqdn}}
           protocol: TCP
-          containerPort: 8140
+          containerPort: {{.Values.services.oauth.internal_port}}
         env:
         - name: aaf_locator_ns
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
+          value: {{ .Release.Namespace }}