diff options
author | Krzysztof Opasiak <k.opasiak@samsung.com> | 2021-04-06 21:53:32 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2021-04-06 21:53:32 +0000 |
commit | 01f77c9e94756b3107bedbee87ca0c6deb05e248 (patch) | |
tree | ab02b4b60bc3973d828e259b3db926c0e11a62d3 /kubernetes/aai/components/aai-sparky-be/resources/config/portal/cadi.properties | |
parent | 48cba2695c768a04499b398272a1f96e8f5d6289 (diff) | |
parent | 375d0eaa1368368df3c2b9512d9ac8ee6056c63d (diff) |
Merge "[AAI][SPARKY] Automatically retrieve certs"
Diffstat (limited to 'kubernetes/aai/components/aai-sparky-be/resources/config/portal/cadi.properties')
-rw-r--r-- | kubernetes/aai/components/aai-sparky-be/resources/config/portal/cadi.properties | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/kubernetes/aai/components/aai-sparky-be/resources/config/portal/cadi.properties b/kubernetes/aai/components/aai-sparky-be/resources/config/portal/cadi.properties index 1f154b6101..baefd9806b 100644 --- a/kubernetes/aai/components/aai-sparky-be/resources/config/portal/cadi.properties +++ b/kubernetes/aai/components/aai-sparky-be/resources/config/portal/cadi.properties @@ -6,14 +6,18 @@ aaf_url=<%=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1 # AAF Environment Designation #if you are running aaf service from a docker image you have to use aaf service IP and port number -aaf_id={{.Values.config.aafUsername}} +aaf_id={{ .Values.certInitializer.fqi }} #Encrypt the password using AAF Jar -aaf_password={{.Values.config.aafPassword}} +aaf_password={{ .Values.certInitializer.aafDeployPass }} # Sample CADI Properties, from CADI 1.4.2 #hostname=org.onap.aai.orr csp_domain=PROD # Add Absolute path to Keyfile -cadi_keyfile={{.Values.config.cadiKeyFile}} +cadi_keyfile={{ .Values.certInitializer.credsPath }}/{{ .Values.certInitializer.fqi_namespace }}.keyfile +cadi_keystore={{ .Values.certInitializer.credsPath }}/{{ .Values.certInitializer.fqi_namespace }}.p12 +cadi_keystore_password=${KEYSTORE_PASSWORD} + +cadi_alias={{ .Values.certInitializer.fqi }} # This is required to accept Certificate Authentication from Certman certificates. # can be TEST, IST or PROD @@ -23,9 +27,9 @@ aaf_env=DEV cadi_loglevel=DEBUG # Add Absolute path to truststore2018.jks -cadi_truststore={{.Values.config.cadiTrustStore}} +cadi_truststore={{ .Values.certInitializer.credsPath }}/{{ .Values.certInitializer.fqi_namespace }}.trust.jks # Note: This is the ONLY password that doesn't have to be encrypted. All Java's TrustStores are this passcode by default, because they are public certs -cadi_truststore_password={{.Values.config.cadiTrustStorePassword}} +cadi_truststore_password=${TRUSTSTORE_PASSWORD} # how to turn on SSL Logging #javax.net.debug=ssl |