summaryrefslogtreecommitdiffstats
path: root/kubernetes/aaf/charts/aaf-oauth
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2019-08-06 16:36:13 -0500
committerInstrumental <jonathan.gathman@att.com>2019-08-06 16:36:50 -0500
commit0c7bc94239b12abefe24d80b7a22c27920647376 (patch)
tree15f20ec5f409a371fea3210f1b6a1a3cad9145eb /kubernetes/aaf/charts/aaf-oauth
parent6261ee91de1fec034cadc5c0be87a92869c5bd14 (diff)
AAF 2.1.15 Dockers
Issue-ID: AAF-902 Change-Id: I3a83eee98dfeb7fb9751019faf618897dbc9d34f Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'kubernetes/aaf/charts/aaf-oauth')
-rw-r--r--kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml9
1 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml
index cc328d5ca6..b371c86541 100644
--- a/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
spec:
initContainers:
- name: {{ include "common.name" . }}-config-container
- image: {{ .Values.global.repository }}/onap/aaf/aaf_config:{{.Values.global.aaf.imageVersion}}
+ image: {{ .Values.global.repository }}/{{.Values.global.aaf.config.image}}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service remove && bin/agent.sh"]
volumeMounts:
@@ -57,14 +57,14 @@ spec:
value: "{{ .Values.global.aaf.aaf_release }}"
- name: aaf_locator_container_ns
value: "{{ .Release.Namespace }}"
- - name: aaf_locator_container
- value: "oom"
- name: aaf_locator_public_fqdn
value: "{{.Values.global.aaf.public_fqdn}}"
- name: aaf_locator_name
value: "{{.Values.global.aaf.aaf_locator_name}}"
- name: aaf_locator_name_oom
value: "{{.Values.global.aaf.aaf_locator_name_oom}}"
+ - name: cm_always_ignore_ips
+ value: "true"
- name: CASSANDRA_CLUSTER
value: "{{.Values.global.aaf.cass.fqdn}}.{{ .Release.Namespace }}"
# - name: CASSANDRA_USER
@@ -72,10 +72,11 @@ spec:
# - name: CASSANDRA_PASSWORD
# value: ""
# - name: CASSANDRA_PORT
+# value: ""
containers:
- name: {{ include "common.name" . }}
command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-oauth aaf-service && exec bin/oauth"]
- image: {{ .Values.global.repository }}/onap/aaf/aaf_oauth:{{.Values.global.aaf.imageVersion}}
+ image: {{ .Values.global.repository }}/{{.Values.global.aaf.image}}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: "/opt/app/osaaf"