Merge "[CONSUL] Add limits to consul chart."

[oom.git] / kubernetes / appc / resources / config / appc / opt / onap / appc / data / properties / cadi.properties

diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/cadi.properties b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/cadi.properties
index 7ce85c3..1a2b1f6 100644 (file)
--- a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/cadi.properties
+++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/cadi.properties
@@ -1,3 +1,4 @@
+{{/*
 ###
 # ============LICENSE_START=======================================================
 # APPC
@@ -18,8 +19,10 @@
 # ============LICENSE_END=========================================================
 ###
 #hostname=localhost
+*/}}
 
-cadi_loglevel=INFO
+cadi_loglevel=DEBUG
+cadi_bath_convert=/opt/onap/appc/data/properties/bath_config.csv
 
 ############################################################
 # Properties Generated by AT&T Certificate Manager
@@ -28,11 +31,11 @@ cadi_loglevel=INFO
 cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US
 cadi_keyfile=/opt/onap/appc/data/stores/org.onap.appc.keyfile
 cadi_keystore=/opt/onap/appc/data/stores/org.onap.appc.p12
-cadi_keystore_password=enc:4DVUTKvRCCtebQrKskDsuKFIHLzOf2M9XxNOhVIK4xb
+cadi_keystore_password=enc:j5wAY4JjI6Gg8KbPRT3CK55kCaBZcrSq9XMe0vU2Hj3_TWfhln414p_og8-0u4EV
 #cadi_key_password=enc:<KEY PASSWORD (optional if the same as KEYSTORE PASSWORD)>
 cadi_alias=appc@appc.onap.org
 cadi_truststore=/opt/onap/appc/data/stores/truststoreONAPall.jks
-cadi_truststore_password=enc:O3Vtv5e77OQWJ_OiLC9Atj3ngyYfulRK519JYFmbKl7
+cadi_truststore_password=enc:9WJ6CRlrFmHiQrFlckhHybFXOwPW3tRetofp3AZ5nyt
 
 ##
 ## org.osaaf.location.props
@@ -47,11 +50,11 @@ cadi_longitude=-122.26147
 aaf_locate_url=https://aaf-locate.{{.Release.Namespace}}:8095
 
 # AAF URL
-aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.0
+aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
 
 # AAF Environment Designation
 aaf_env=DEV
 
 # OAuth2 Endpoints
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.0/token
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.0/introspect
+aaf_oauth2_token_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.token:2.1/token
+aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.introspect:2.1/introspect