From: dglFromAtt <dgl@research.att.com>
Date: Sat, 3 Mar 2018 17:00:41 +0000 (-0500)
Subject: changes for CSIT integration
X-Git-Tag: v1.0.12~22^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fbuscontroller.git;a=commitdiff_plain;h=ccb31a508c0ec558f00454f7e814272b273d72d7

changes for CSIT integration

Change-Id: I6e04f55fe4146c80e475f771da38173be12e2a0f
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-318
---

diff --git a/misc/dmaapbc b/misc/dmaapbc
index 3d19f88..19bb3f7 100644
--- a/misc/dmaapbc
+++ b/misc/dmaapbc
@@ -34,12 +34,13 @@ config() {
 	fi
 	cd $APP_ROOT
 	source $CONTAINER_CONFIG
-	if [ ! -f $APP_ROOT/misc/cert-client-init.sh ]
-	then
-		echo "Did not find $APP_ROOT/misc/cert-client-init.sh to append to truststore"
-		exit 1
-	fi
-	$APP_ROOT/misc/cert-client-init.sh
+	# comment out till certs are available
+	#if [ ! -f $APP_ROOT/misc/cert-client-init.sh ]
+	#then
+	#	echo "Did not find $APP_ROOT/misc/cert-client-init.sh to append to truststore"
+	#	exit 1
+	#fi
+	#$APP_ROOT/misc/cert-client-init.sh
 	. misc/dmaapbc.properties.tmpl > etc/dmaapbc.properties
     . misc/PolicyEngineApi.properties.tmpl > config/PolicyEngineApi.properties
 	set +x
diff --git a/misc/dmaapbc.properties.tmpl b/misc/dmaapbc.properties.tmpl
index c60d689..5b7ee28 100644
--- a/misc/dmaapbc.properties.tmpl
+++ b/misc/dmaapbc.properties.tmpl
@@ -2,6 +2,8 @@ cat <<!EOF
 #
 #	Configuration parameters fixed at startup for the DMaaP Bus Controller
 #
+# CSIT TESTING
+csit: ${DMAAPBC_CSIT:-No}
 #
 #	URI to retrieve dynamic DR configuration
 #
@@ -185,7 +187,8 @@ UsePE: ${DMAAPBC_PE_ENABLED:-false}
 # Argument to decisionAttributes.put("AAF_ENVIRONMENT", X); 
 # where X is:  TEST= UAT, PROD = PROD, DEVL = TEST
 #
-PeAafEnvironment: ${DMAAPBC_PE_AAF_ENV:-DEVL}
+PeAafEnvironment: ${DMAAPBC_PE_AAF_ENV:-CSIT}
+PeAafUrl.CSIT:  ${DMAAPBC_AAF_URL:-http://localhost:8095/proxy/}
 PeAafUrl.DEVL:  https://aafdev.onap.org:8095/proxy/
 PeAafUrl.TEST:  https://aafist..onap.org:8095/proxy/
 PeAafUrl.PROD:  https://aafprod.onap.org:8095/proxy/