X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsrc%2Fmain%2Fproperties%2Fcadi.properties;h=96d25d1b650067d62e114a15091ad0b614665abd;hb=refs%2Fheads%2Fmaster;hp=9d8e0cbfcab9a9e328202c8deb14c8b52e326076;hpb=44e6a14e59209bb03ea9fe48343f67cae591bd2f;p=appc%2Fdeployment.git

diff --git a/installation/src/main/properties/cadi.properties b/installation/src/main/properties/cadi.properties
index 9d8e0cb..96d25d1 100644
--- a/installation/src/main/properties/cadi.properties
+++ b/installation/src/main/properties/cadi.properties
@@ -17,38 +17,42 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 ###
-hostname=localhost
- 
-csp_devl_localhost=true
-
-# should this be onap.org?
-basic_realm=onap.org
-
-basic_warn=TRUE
- 
-cadi_loglevel=DEBUG
- 
-aaf_taf_class=com.att.cadi.aaf.v2_0.AAFTaf
-aaf_domain_support=.org
-
-# add location of keyfile to use encrypted password
-#cadi_keyfile=/opt/appc/data/stores/appckeyfile
-#cadi_keystore=etc/keystore/truststore2018.jks
-#cadi_keystore_password=changeit 
- 
-AFT_DME2_CLIENT_IGNORE_SSL_CONFIG=false
-
-cadi_protocols=TLSv1.1,TLSv1.2
-
-# Configure AAF
-aaf_url=http://10.12.5.148:8101
-
-aaf_id=admin@appc.onap.org
-
-# to use encrypted password ensure cadi_keyfile location has been set
-aaf_password=appc_admin
-
-aaf_timeout=5000 
-aaf_clean_interval=30000 
-aaf_user_expires=5000 
-aaf_high_count=1000 
\ No newline at end of file
+#hostname=localhost
+
+cadi_loglevel=INFO
+cadi_bath_convert=/opt/onap/appc/data/properties/bath_config.csv
+
+############################################################
+# Properties Generated by AT&T Certificate Manager
+# @copyright 2016, AT&T
+############################################################
+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: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:9WJ6CRlrFmHiQrFlckhHybFXOwPW3tRetofp3AZ5nyt
+
+##
+## org.osaaf.location.props
+##
+## Localized Machine Information
+##
+# Almeda California ?
+cadi_latitude=37.78187
+cadi_longitude=-122.26147
+
+# Locate URL (which AAF Env)
+aaf_locate_url=https://aaf-onap-test.osaaf.org:8095
+
+# AAF URL
+aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.0
+
+# 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