diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-09-14 14:00:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-09-14 14:00:16 +0000 |
| commit | f298897e7e5871bef78ca49b9b4bf9d2b0741658 (patch) | |
| tree | caeeb48491a8df75918a0c15c293f58a2a0955ac /kubernetes/aai/components/aai-schema-service/config/aaiconfig.properties | |
| parent | 3188824be7f3ba27c606d93b14e280fe01db9109 (diff) | |
| parent | 27fd7d8750ceeb798052eb8af36264c79b6536fb (diff) | |
Merge "[AAI] Service Mesh compatibility"
Diffstat (limited to 'kubernetes/aai/components/aai-schema-service/config/aaiconfig.properties')
| -rw-r--r-- | kubernetes/aai/components/aai-schema-service/config/aaiconfig.properties | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kubernetes/aai/components/aai-schema-service/config/aaiconfig.properties b/kubernetes/aai/components/aai-schema-service/config/aaiconfig.properties index b107cd4f3a..b0ed0e89a0 100644 --- a/kubernetes/aai/components/aai-schema-service/config/aaiconfig.properties +++ b/kubernetes/aai/components/aai-schema-service/config/aaiconfig.properties @@ -19,20 +19,28 @@ # ============LICENSE_END========================================================= */}} +{{ 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 .Values.global.config.basic.auth.enabled }} +{{ if or (.Values.global.config.basic.auth.enabled) ( include "common.onServiceMesh" .) }} aai.tools.enableBasicAuth=true 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.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 }} +{{ end }} aai.default.api.version={{ .Values.global.config.schema.version.api.default }} |