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

diff --git a/auth/helm/aaf/templates/aaf-oauth.yaml b/auth/helm/aaf/templates/aaf-oauth.yaml
index f5e5e20e..4d5ac75a 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: 2
+  replicas: {{ .Values.services.oauth.replicas }}
   selector:
     matchLabels:
       app: aaf-oauth
@@ -52,40 +52,37 @@ spec:
     spec:
       volumes:
         # Use this Pod Sharing dir to declare various States of starting
-      - name: {{ .Chart.Name }}-config-vol
-        emptyDir: {}
+      - name: aaf-config-vol
+        persistentVolumeClaim:
+          claimName: aaf-config-pvc
+      - name: aaf-status-vol
+        persistentVolumeClaim:
+          claimName: aaf-status-pvc
       initContainers:
-        - name: {{ .Chart.Name }}-config-container
+        - name: aaf-config-container
           image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
           imagePullPolicy: IfNotPresent
+          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: AAF_REGISTER_AS
-              value: "aaf-oauth"
-            - 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"
+            - 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","/opt/app/aaf/pod/pod_wait.sh","aaf_oauth","sleep","50", "cd /opt/app/aaf;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
+        - mountPath: "/opt/app/osaaf"
+          name: aaf-config-vol
+        - mountPath: "/opt/app/aaf/status"
+          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
+          value: {{ .Release.Namespace }}