Recommended AAF/OOM Changes

This incorporats Mike E's changes as well as recommended
changes from Abandoned 70511 (merges from multiple
machines got too hard.)

Made Olaf recommended changes.  Changed to non-SNAPSHOT in
anticipation of LF releasing this morning

Put Versions back to "2.1.5-SNAPSHOT"  Brian F reminded
me that GWu's scripts handle version changes for
Envs.

Issue-ID: AAF-557
Change-Id: I3e81a9c65df356d1d27b0d453e09c9ed3a81f803
Signed-off-by: Instrumental <jonathan.gathman@att.com>

2 files changed, 27 insertions, 24 deletions

diff --git a/charts/aaf-oauth/templates/deployment.yaml b/charts/aaf-oauth/templates/deployment.yaml
index 06cf273..aed0bbe 100644
--- a/charts/aaf-oauth/templates/deployment.yaml
+++ b/charts/aaf-oauth/templates/deployment.yaml
@@ -31,23 +31,30 @@ spec:
         release: {{ .Release.Name }}
     spec:
       initContainers:
-      - name: {{ include "common.name" . }}-job-complete
-        command:
-        - /root/job_complete.py
-        args:
-        - --job-name
-        - {{ .Release.Name }}-create-config
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+      - name: {{ include "common.name" . }}-config-container
+        image: "{{ include "common.repository" . }}/{{ .Values.global.configImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        volumeMounts:
+          - mountPath: "/opt/app/osaaf"
+            name: {{ include "common.name" . }}-config-vol
+        env:
+          - name: HOSTNAME
+            value: "{{ .Values.global.cadi.hostname }}"
+          - name: AAF_ENV
+            value: "{{ .Values.global.cadi.aaf_env }}"
+          - name: AAF_REGISTER_AS
+            value: "{{ .Values.aaf_register_as }}"
+          - name: LATITUDE
+            value: "{{ .Values.global.cadi.cadi_latitude }}"
+          - name: LONGITUDE
+            value: "{{ .Values.global.cadi.cadi_longitude }}"
+          - name: CASS_HOST
+            value: "{{ .Values.global.cadi.cass_host }}"
+          - name: AAF_LOCATOR_AS
+            value: "{{ .Values.global.cadi.cadi_locator_as }}"
       - name: {{ include "common.name" . }}-readiness
         command:
-          - /root/ready.py
+        - /root/ready.py
         args:
         - --container-name
         - aaf-locate
@@ -66,7 +73,7 @@ spec:
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
         - mountPath: "/opt/app/osaaf"
-          name: shared-config-volume
+          name: {{ include "common.name" . }}-config-vol
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
@@ -96,12 +103,7 @@ spec:
       - name: localtime
         hostPath:
           path: /etc/localtime
-      - name: shared-config-volume
-      {{- if .Values.global.persistence.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ .Release.Name }}-config
-      {{- else }}
+      - name: {{ include "common.name" . }}-config-vol
         emptyDir: {}
-      {{- end }}
       imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file
+      - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/charts/aaf-oauth/values.yaml b/charts/aaf-oauth/values.yaml
index 72c793a..651f53e 100644
--- a/charts/aaf-oauth/values.yaml
+++ b/charts/aaf-oauth/values.yaml
@@ -25,7 +25,8 @@ flavor: small
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_oauth:2.1.4-SNAPSHOT
+image: onap/aaf/aaf_oauth:2.1.5-SNAPSHOT
+aaf_register_as: "aaf-oauth.onap"
 pullPolicy: Always
 
 
@@ -76,4 +77,4 @@ resources:
     requests:
       cpu: 40m
       memory: 200Mi
-  unlimited: {}
\ No newline at end of file
+  unlimited: {}