diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-09-19 15:40:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-19 15:40:14 +0000 |
| commit | 5a613c9dc4ab1768094bf08983cf0e8d62e6ae63 (patch) | |
| tree | db600928b12e27ea590f5d9e59d99ec30b8d6a3a | |
| parent | 11da19b7ee211441386aa15b8d0037d5160a96bf (diff) | |
| parent | 70fc8047e5658a2a66d74c0de2dac89628784b68 (diff) | |
Merge "Remove credentials from charts"
| -rw-r--r-- | kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties | 7 | ||||
| -rw-r--r-- | kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties | 5 |
2 files changed, 0 insertions, 12 deletions
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_host_or_IP>:<port> -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 |