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

diff --git a/auth/helm/aaf/templates/aaf-oauth.yaml b/auth/helm/aaf/templates/aaf-oauth.yaml
index f59a7d24..3e36d29c 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,27 +52,27 @@ 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
+        - 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"]
           volumeMounts:
             - mountPath: "/opt/app/osaaf"
-              name: {{ .Chart.Name }}-config-vol
+              name: aaf-config-vol
           env:
             - name: AAF_ENV
-              value: "{{ .Values.cadi.aaf_env }}"
+              value: "{{ .Values.services.aaf_env }}"
             - name: LATITUDE
-              value: "{{ .Values.cadi.cadi_latitude }}"
+              value: "{{ .Values.services.cadi_latitude }}"
             - name: LONGITUDE
-              value: "{{ .Values.cadi.cadi_longitude }}"
+              value: "{{ .Values.services.cadi_longitude }}"
             - name: aaf_locator_container
               value: "helm"
             - name: aaf_locator_container_ns
@@ -80,11 +80,15 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: aaf_locate_url
-              value: "https://aaf-locate.onap:8095"
-            - name: aaf_locator_public_hostname
-              value: "aaf.osaaf.org"
+              value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
+            - name: aaf_locator_public_fqdn
+              value: "{{.Values.services.public_fqdn}}"
+            - name: aaf_locator_name
+              value: "{{.Values.services.aaf_locator_name}}"
+            - name: aaf_locator_name_helm
+              value: "{{.Values.services.aaf_locator_name_helm}}"
             - name: CASSANDRA_CLUSTER
-              value: "aaf-cass"
+              value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
 #            - name: CASSANDRA_USER
 #              value: ""
 #            - name: CASSANDRA_PASSWORD
@@ -95,19 +99,19 @@ spec:
 ###
 ### AAF-OAUTH
 ###
-      - name: {{ .Chart.Name }}-oauth
+      - name: aaf-oauth
         image: {{ .Values.image.repository }}onap/aaf/aaf_oauth:{{ .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: