summaryrefslogtreecommitdiffstats
path: root/kubernetes/aaf/charts/aaf-gui/templates
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2019-08-15 19:34:47 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-15 19:34:47 +0000
commitb105b3dd34a46a2c3275f09640ec771e4077287b (patch)
tree6c11343da6994adb223fb5c2e4af2e2f1e579a33 /kubernetes/aaf/charts/aaf-gui/templates
parent3d4159518989111cf05ad36600a0bdd7d2263df2 (diff)
parent0c7bc94239b12abefe24d80b7a22c27920647376 (diff)
Merge "AAF 2.1.15 Dockers"
Diffstat (limited to 'kubernetes/aaf/charts/aaf-gui/templates')
-rw-r--r--kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml9
1 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml
index d067b5ec25..4a433cccfd 100644
--- a/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-gui/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-gui aaf-locate && exec bin/gui"]
- image: {{ .Values.global.repository }}/onap/aaf/aaf_gui:{{.Values.global.aaf.imageVersion}}
+ image: {{ .Values.global.repository }}/{{.Values.global.aaf.image}}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: "/opt/app/osaaf"