X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=misc%2Fdmaapbc;h=aca8f9e0dd6f37a8b93bb1fed30cd33025016f2a;hb=53eef7bbc76b4443877e5ab4a1bd10083335e41e;hp=3dcef4aa899be7e6e3de71e8b5c4565d727b8908;hpb=0f62fd58cfab28353a911bd24e5df5874e3b5b58;p=dmaap%2Fbuscontroller.git

diff --git a/misc/dmaapbc b/misc/dmaapbc
index 3dcef4a..aca8f9e 100644
--- a/misc/dmaapbc
+++ b/misc/dmaapbc
@@ -31,8 +31,9 @@ PATH=/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/java/jdk/
 export PATH
 CLASSPATH=`echo $APP_ROOT/etc $APP_ROOT/lib/*.jar | tr ' ' ':'` 
 export CLASSPATH
-CONFIGMAP_ROOT=/opt/app/config
-CONTAINER_CONFIG=$CONFIGMAP_ROOT/conf
+CONFIGMAP_ROOT=${CONFIGMAP_ROOT:-/opt/app/config}
+CONFIGMAP_PROPS=${CONFIGMAP_PROPS:-$CONFIGMAP_ROOT/conf/dmaapbc.properties}
+CONTAINER_CONFIG=$CONFIGMAP_ROOT/conf/buscontroller.env
 MAIN=org.onap.dmaap.dbcapi.server.Main 
 
 
@@ -44,6 +45,7 @@ pids() {
 }
 
 config() {
+	echo "ENTER config"
 	set -x
 	if [ ! -d $APP_ROOT ]
 	then
@@ -52,8 +54,8 @@ config() {
 	fi
 	if [ !  -f $CONTAINER_CONFIG ]
 	then
-		echo "Expected env file $CONTAINER_CONFIG not found"
-		exit 1
+		echo "WARNING: Expected env file $CONTAINER_CONFIG not found. Default behaviors in effect"
+		find $CONTAINER_ROOT -type f
 	fi
 	cd $APP_ROOT
 	source $CONTAINER_CONFIG
@@ -74,12 +76,25 @@ config() {
 	$APP_ROOT/misc/cert-client-init.sh
 	. misc/havecert.tmpl > etc/havecert
 	chmod +x etc/havecert
-	. misc/dmaapbc.properties.tmpl > etc/dmaapbc.properties
-    . misc/PolicyEngineApi.properties.tmpl > config/PolicyEngineApi.properties
+
+	# These files might be better provided in kubernetes configmaps
+	# so if they are there, use them
+	if [ -f $CONFIGMAP_PROPS ]
+	then
+		PROPS=$CONFIGMAP_PROPS
+	else
+		PROPS=etc/dmaapbc.properties
+		. misc/dmaapbc.properties.tmpl > $PROPS
+	fi
+	if [ ! -f config/PolicyEngineApi.properties ]
+	then
+    		. misc/PolicyEngineApi.properties.tmpl > config/PolicyEngineApi.properties
+	fi
 	set +x
 }
 
 start() {
+	echo "ENTER start"
 	set -x
 	ID=`id -n -u`
 	GRP=`id -n -g`
@@ -94,6 +109,7 @@ start() {
 		exit 1
 	fi
 	cd $APP_ROOT
+	pwd
 
 	if etc/havecert
 	then
@@ -112,7 +128,7 @@ start() {
 
 	# JVM flags
 #old line from Dockerfile...keep for reference only
-	FLAGS="-cp etc:lib/* -Dlog4j.configuration=etc/log4j.properties -Ddmaapbc.properties=etc/dmaapbc.properties  -Dlogback.configurationFile=etc/logback.xml -Dhttps.protocols=TLSv1.2 -Dhttps.cipherSuites=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
+	FLAGS="-cp etc:lib/* -Dlog4j.configuration=etc/log4j.properties -DConfigFile=$PROPS  -Dlogback.configurationFile=etc/logback.xml -Dhttps.protocols=TLSv1.2 -Dhttps.cipherSuites=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
 	#nohup java $FLAGS $MAIN </dev/null >/dev/null 2>&1 &
 	nohup java $FLAGS $MAIN </dev/null  &
 	sleep 5
@@ -121,6 +137,7 @@ start() {
 }
 
 stop() {
+	echo "ENTER stop"
 	ID=`id -n -u`
 	GRP=`id -n -g`
 	if [ "$ID" != "$USER" ]
@@ -147,6 +164,7 @@ stop() {
 }
 
 status() {
+	echo "ENTER status"
 	PIDS=`pids`
 	if [ "$PIDS" != "" ]
 	then
@@ -157,6 +175,7 @@ status() {
 }
 
 init() {
+	echo "ENTER init"
 	if [ ! -d $CONFIGMAP_ROOT ]
 	then
 		echo $CONFIGMAP_ROOT does not exist
@@ -165,14 +184,15 @@ init() {
 
 	#loop on get /dmaap until we get a good response to indicate other provisioning can continue
 	rc=999
-	while [ $rc != "200 ]
+	while [ $rc != "200" ]
 	do
 		sleep 10
-		rc=`curl -s -w "%{http_code}" -X GET -H "Content-Type: application/json" http://dmaap-bc:8080/webapi/dmaap`
+		rc=`curl -s -o /dev/null -I -w "%{http_code}" -X GET -H "Content-Type: application/json" http://dmaap-bc:8080/webapi/dmaap`
 		echo "get dmaap response=${rc}"
 	done
 
 	cd $CONFIGMAP_ROOT
+	pwd
 	# order is important in this next list
 	for uri in dmaap dcaeLocations mr_clusters topics feeds
 	do
@@ -180,7 +200,9 @@ init() {
 		then
 			for j in `ls ${uri}/*.json`
 			do
-				curl -v -X POST -H "Content-Type: application/json" -d @${j} http://dmaap-bc:8080/webapi/${uri}
+				echo "POST $j to $uri"
+				rc=`curl -v -X POST -w "%{http_code}" -H "Content-Type: application/json" -d @${j} http://dmaap-bc:8080/webapi/${uri}`
+				echo "response=$rc"
 			done
 		fi
 	done