From: Tait,Trevor(rt0435) Date: Wed, 19 Sep 2018 15:10:23 +0000 (-0400) Subject: Remove credentials from charts X-Git-Tag: 3.0.0-ONAP~308^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=70fc8047e5658a2a66d74c0de2dac89628784b68;p=oom.git Remove credentials from charts Issue-ID: OOM-1420 The application.properties files in pomba-networkdiscovery and pomba-servicedecomposition have sensitive keystore/certificate/password data that needs to be removed Change-Id: I5f1fb729197c18d0de40b354e598c03a398f0b10 Signed-off-by: Tait,Trevor(rt0435) --- diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties index c4c00d3509..274a872856 100644 --- a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties +++ b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties @@ -35,13 +35,6 @@ server.context_parameters.p-name=value #context parameter with p-name as key and basicAuth.username={{ .Values.config.networkDiscoveryUserId }} basicAuth.password={{ .Values.config.networkDiscoveryPassword }} -# A&AI Enircher REST Client Configuration -enricher.url=https://: -enricher.connectionTimeout=5000 -enricher.readTimeout=60000 -enricher.keyStorePath=config/auth/enricher-client-cert.p12 -enricher.keyStorePassword=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o - enricher.types = vserver, l3-network enricher.type.vserver.url = /enricher/v11/cloud-infrastructure/vservers/vserver/{0}?sot=!aai enricher.type.l3-network.url = /enricher/v11/network/l3-networks/l3-network/{0}?sot=!aai diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties b/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties index 26737f5d88..c271040cab 100644 --- a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties +++ b/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties @@ -35,11 +35,6 @@ basicAuth.password={{ .Values.config.serviceDecompositionPassword }} aai.host=127.0.0.1 aai.port=8443 aai.httpProtocol=http -aai.trustStorePath=tomcat_keystore -aai.keyStorePath=aai-client-cert.p12 -aai.keyStorePassword=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o -aai.keyManagerFactoryAlgorithm=SunX509 -aai.keyStoreType=PKCS12 aai.securityProtocol=TLS aai.connectionTimeout=5000 aai.readTimeout=1000