diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2021-11-15 10:25:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-11-15 10:25:55 +0000 |
| commit | 24b065f99849c6b306e55890dd0d1f8e8f1a9356 (patch) | |
| tree | 4e01907c82c47ed94480328677c6b9b6ba414a61 /kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties | |
| parent | ec4b3f210fa5c2544dc260094c326ceb8995b265 (diff) | |
| parent | c57b58ddca8fa19fad93b3aea70e556ad6f045d8 (diff) | |
Merge "[AAI][SCHEMA] Remove Hardcoded certificates"
Diffstat (limited to 'kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties')
| -rw-r--r-- | kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties index 512e906b00..f768338d99 100644 --- a/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties +++ b/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties @@ -4,6 +4,7 @@ # org.onap.aai # ================================================================================ # Copyright © 2018 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright © 2021 Orange # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -41,10 +42,10 @@ aai.tools.password={{ .Values.global.config.basic.auth.passwd }} {{ end }} {{ if ( include "common.needTLS" .) }} -aai.truststore.filename={{ .Values.global.config.truststore.filename }} -aai.truststore.passwd.x={{ .Values.global.config.truststore.passwd }} -aai.keystore.filename={{ .Values.global.config.keystore.filename }} -aai.keystore.passwd.x={{ .Values.global.config.keystore.passwd }} +aai.truststore.filename={{ .Values.certInitializer.credsPath }}/{{ .Values.certInitializer.fqi_namespace }}.trust.jks +aai.truststore.passwd.x=${TRUSTSTORE_PASSWORD} +aai.keystore.filename={{ .Values.certInitializer.credsPath }}/{{ .Values.certInitializer.fqi_namespace }}.p12 +aai.keystore.passwd.x=${KEYSTORE_PASSWORD} {{ end }} aai.notification.current.version={{ .Values.global.config.schema.version.api.default }} |