summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/components/so-cnf-adapter
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-03-19 15:06:41 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-03-20 08:28:18 +0000
commitfde94076e689727e8a2c3c5147ce1242dc225f87 (patch)
treeb7df4064762a376f9f45e4d6e98e847a22b3da3c /kubernetes/so/components/so-cnf-adapter
parentde5edf772c56647eee03c60d24e3cf1d41c56c21 (diff)
[SO] Use truststore all keystore
Truststore given by AAF is only giving ONAP root_ca. In order to have access to other platforms, we must also have all the other ones. As ONAP root ÇA and all known CAs are present in truststore All, let's use it. Issue-ID: OOM-2688 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I551b8e4a316dcf4f2dee1bf6c45327496a488cdd
Diffstat (limited to 'kubernetes/so/components/so-cnf-adapter')
-rwxr-xr-xkubernetes/so/components/so-cnf-adapter/templates/deployment.yaml4
1 files changed, 1 insertions, 3 deletions
diff --git a/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml b/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml
index 4518a5f607..0d80b2a9ae 100755
--- a/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml
@@ -63,8 +63,7 @@ spec:
export AAF_AUTH=$(echo "Basic ${AAF_BASE64}")
export AAI_AUTH=$(cat /input/.aai_creds)
{{- if .Values.global.aafEnabled }}
- export $(grep '^c' {{ .Values.soHelpers.certInitializer.credsPath }}/mycreds.prop | xargs -0)
- export TRUSTSTORE_PASSWORD="${cadi_truststore_password}"
+ export $(cat {{ .Values.soHelpers.certInitializer.credsPath }}/mycreds.prop | xargs -0)
{{- if .Values.global.security.aaf.enabled }}
export KEYSTORE_PASSWORD="${cadi_keystore_password}"
{{- end }}
@@ -116,4 +115,3 @@ spec:
medium: Memory
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
-