From f79aaafbfe692dacd2fc32df9ae1030d4536210a Mon Sep 17 00:00:00 2001 From: Geora Barsky Date: Thu, 6 Dec 2018 12:24:20 -0500 Subject: [PATCH] Add optional support for SSL client into cxt bldrs Issue-ID: LOG-807 Change-Id: I27f5afd20208d71d47853aaaa6ff089c2f550f39 Signed-off-by: Geora Barsky --- .../pomba-aaictxbuilder/resources/config/application.properties | 5 +++++ .../pomba-sdncctxbuilder/resources/config/application.properties | 5 +++++ .../resources/config/application.properties | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/resources/config/application.properties b/kubernetes/pomba/charts/pomba-aaictxbuilder/resources/config/application.properties index 194ab1d414..41ec250ac8 100644 --- a/kubernetes/pomba/charts/pomba-aaictxbuilder/resources/config/application.properties +++ b/kubernetes/pomba/charts/pomba-aaictxbuilder/resources/config/application.properties @@ -28,6 +28,11 @@ server.tomcat.min-spare-threads=25 # AAI REST Client Configuration aai.serviceName={{ .Values.config.aaiServiceName }}.{{.Release.Namespace}} aai.servicePort={{ .Values.config.aaiPort }} +# AAI APIs authentication mode. Valid values: [basic_auth, client_cert] +aai.authentication=basic_auth +aai.trustStorePath=n/a +aai.keyStorePath=n/a +aai.keyStorePassword=n/a aai.username={{ .Values.config.aaiUsername }} aai.password={{ .Values.config.aaiPassword }} aai.httpProtocol={{ .Values.config.aaiHttpProtocol }} diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/application.properties b/kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/application.properties index e9bd107d94..fcfe9dc412 100644 --- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/application.properties +++ b/kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/application.properties @@ -34,6 +34,11 @@ sdncCtxBuilder.password={{ .Values.config.sdncCtxBuilderPassword }} # AAI REST Client Configuration aai.serviceName={{ .Values.config.aaiServiceName }}.{{.Release.Namespace}} aai.servicePort={{ .Values.config.aaiPort }} +# AAI APIs authentication mode. Valid values: [basic_auth, client_cert] +aai.authentication=basic_auth +aai.trustStorePath=n/a +aai.keyStorePath=n/a +aai.keyStorePassword=n/a aai.username={{ .Values.config.aaiUsername }} aai.password={{ .Values.config.aaiPassword }} aai.httpProtocol={{ .Values.config.aaiHttpProtocol }} diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties b/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties index 5b64f841e2..8c7d27cab0 100644 --- a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties +++ b/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties @@ -34,6 +34,11 @@ basicAuth.password={{ .Values.config.serviceDecompositionPassword }} # AAI REST Client Configuration aai.serviceName={{ .Values.config.aaiServiceName }}.{{.Release.Namespace}} aai.servicePort={{ .Values.config.aaiPort }} +# AAI APIs authentication mode. Valid values: [basic_auth, client_cert] +aai.authentication=basic_auth +aai.trustStorePath=n/a +aai.keyStorePath=n/a +aai.keyStorePassword=n/a aai.username={{ .Values.config.aaiUsername }} aai.password={{ .Values.config.aaiPassword }} aai.httpProtocol={{ .Values.config.aaiHttpProtocol }} -- 2.16.6