diff options
| author |   efiacor <fiachra.corcoran@est.tech> | 2023-03-23 12:10:50 +0000 |
|---|---|---|
| committer | efiacor <fiachra.corcoran@est.tech> | 2023-03-29 21:59:15 +0100 |
| commit | d12c16773174e0cdd1fcdd861c7b93ae05de1bc9 (patch) | |
| tree | 84d8b5e17d0c5520c59f81a4a41d47da695b8bca /kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties | |
| parent | 11e85382bc62797ea511a42b1bd647772129c0d7 (diff) | |
[AAI] Remove AAF/TLS config from charts
Remove aaf and tls config from aai charts
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: Ibb26e7ae00eb6b5a65ec2263b8f57ad6fb345892
Issue-ID: OOM-3111
Diffstat (limited to 'kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties')
| -rw-r--r-- | kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties b/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties index b8a2b5fe03..559166ba8e 100644 --- a/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties +++ b/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties @@ -5,6 +5,7 @@ # ================================================================================ # Copyright © 2017 AT&T Intellectual Property. All rights reserved. # Modifications Copyright © 2020 Orange +# Modifications Copyright © 2023 Nordix Foundation # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -27,16 +28,9 @@ aai.config.checktime=1000 # this could come from siteconfig.pl? aai.config.nodename=AutomaticallyOverwritten - -{{ if ( include "common.needTLS" .) }} -aai.server.url.base=https://aai.{{ include "common.namespace" . }}:8443/aai/ -aai.server.url=https://aai.{{ include "common.namespace" . }}:8443/aai/{{ .Values.global.config.schema.version.api.default }}/ -aai.global.callback.url=https://aai.{{ include "common.namespace" . }}:8443/aai/ -{{else}} aai.server.url.base=http://aai.{{ include "common.namespace" . }}/aai/ aai.server.url=http://aai.{{ include "common.namespace" . }}/aai/{{ .Values.global.config.schema.version.api.default }}/ aai.global.callback.url=http://aai.{{ include "common.namespace" . }}/aai/ -{{ end }} {{ if or (.Values.global.config.basic.auth.enabled) ( include "common.onServiceMesh" .) }} aai.tools.enableBasicAuth=true @@ -44,13 +38,6 @@ aai.tools.username={{ .Values.global.config.basic.auth.username }} aai.tools.password={{ .Values.global.config.basic.auth.passwd }} {{ end }} -{{ if ( include "common.needTLS" .) }} -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 }} aai.notificationEvent.default.status=UNPROCESSED aai.notificationEvent.default.eventType={{ .Values.global.config.notification.eventType }} |