From 9733421dbe8eb679bfc406f899ca8e68b768bc3c Mon Sep 17 00:00:00 2001 From: sunil unnava Date: Thu, 13 Sep 2018 17:42:03 -0400 Subject: AAF integration modifications Issue-ID: DMAAP-772 Change-Id: Ia343208e3a4bcecf1674413e387da1b9b8dfb594 Signed-off-by: sunil unnava --- demo/docker_files/cadi.properties | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'demo') diff --git a/demo/docker_files/cadi.properties b/demo/docker_files/cadi.properties index 1cb00a5..a79bb8d 100644 --- a/demo/docker_files/cadi.properties +++ b/demo/docker_files/cadi.properties @@ -1,21 +1,20 @@ -basic_realm=openecomp.org -basic_warn=TRUE +aaf_locate_url=https://aaf-onap-test.osaaf.org:8095 +aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1 +aaf_env=DEV +aaf_lur=org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm -cadi_loglevel=DEBUG -#cadi_keyfile=target/swm/package/nix/dist_files/appl/${artifactId}/etc/keyfile2 -cadi_keyfile=/appl/dmaapMR1/etc/keyfile -# Configure AAF -aaf_url=https://DME2RESOLVE/service=org.openecomp.authz.AuthorizationService/version=2.0/envContext=DEV/routeOffer=BAU_SE +cadi_truststore=/appl/dmaapMR1/etc/truststoreONAPall.jks +cadi_truststore_password=changeit -aaf_id=dgl@openecomp.org -aaf_password=enc:f2u5br1mh29M02- -aaf_timeout=5000 -aaf_clean_interval=1200000 -aaf_user_expires=60000 -aaf_high_count=1000000 +cadi_keyfile=/appl/dmaapMR1/etc/keyfilenew +cadi_alias=dmaapmr@mr.dmaap.onap.org +cadi_keystore=/appl/dmaapMR1/etc/org.onap.dmaap.mr.p12 +cadi_keystore_password=Messaging for All +cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US -# The following properties are being set by the AJSC Container and should NOT need to be set here. -AFT_LATITUDE=33.823589 -AFT_LONGITUDE=-84.366982 -AFT_ENVIRONMENT=AFTUAT + +cadi_loglevel=INFO +cadi_protocols=TLSv1.1,TLSv1.2 +cadi_latitude=37.78187 +cadi_longitude=-122.26147 \ No newline at end of file -- cgit 1.2.3-korg