From fde94076e689727e8a2c3c5147ce1242dc225f87 Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Fri, 19 Mar 2021 15:06:41 +0100 Subject: [SO] Use truststore all keystore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Change-Id: I551b8e4a316dcf4f2dee1bf6c45327496a488cdd --- kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'kubernetes/so/components/so-cnf-adapter') 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" - -- cgit 1.2.3-korg