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

diff --git a/misc/dmaapbc b/misc/dmaapbc
index b26952c..aca8f9e 100644
--- a/misc/dmaapbc
+++ b/misc/dmaapbc
@@ -1,4 +1,25 @@
 #!/bin/bash
+#
+# ============LICENSE_START==========================================
+# org.onap.dmaap
+# ===================================================================
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# ===================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END============================================
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+#
 
 umask 0022
 TZ=GMT0
@@ -10,7 +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
-CONTAINER_CONFIG=/opt/app/config/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 
 
 
@@ -22,6 +45,7 @@ pids() {
 }
 
 config() {
+	echo "ENTER config"
 	set -x
 	if [ ! -d $APP_ROOT ]
 	then
@@ -30,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
@@ -43,19 +67,34 @@ config() {
 	else
 		echo "Not creating $APP_ROOT/ok_to_exit"
 	fi	
-	# 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
+	
+	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/havecert.tmpl > etc/havecert
+	chmod +x etc/havecert
+
+	# 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`
@@ -70,15 +109,15 @@ start() {
 		exit 1
 	fi
 	cd $APP_ROOT
+	pwd
 
-# disable until we use certs
-#	if etc/havecert
-#	then
+	if etc/havecert
+	then
 		echo >/dev/null
-#	else
-#		echo No certificate file available.  Cannot start
-#		exit 0
-#	fi
+	else
+		echo No certificate file available.  Cannot start
+		exit 0
+	fi
 	PIDS=`pids`
 	if [ "$PIDS" != "" ]
 	then
@@ -89,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  -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
@@ -98,6 +137,7 @@ start() {
 }
 
 stop() {
+	echo "ENTER stop"
 	ID=`id -n -u`
 	GRP=`id -n -g`
 	if [ "$ID" != "$USER" ]
@@ -124,6 +164,7 @@ stop() {
 }
 
 status() {
+	echo "ENTER status"
 	PIDS=`pids`
 	if [ "$PIDS" != "" ]
 	then
@@ -133,11 +174,46 @@ status() {
 	fi
 }
 
+init() {
+	echo "ENTER init"
+	if [ ! -d $CONFIGMAP_ROOT ]
+	then
+		echo $CONFIGMAP_ROOT does not exist
+		return
+	fi
+
+	#loop on get /dmaap until we get a good response to indicate other provisioning can continue
+	rc=999
+	while [ $rc != "200" ]
+	do
+		sleep 10
+		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
+		if [ -d ${uri} ]
+		then
+			for j in `ls ${uri}/*.json`
+			do
+				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
+}
+
 set -x
 case "$1" in
 'deploy')
 	config
 	start
+	init
 	wait
 	;;
 'start')
@@ -159,13 +235,13 @@ case "$1" in
 	exit 1
 	;;
 esac
-		ls -l $APP_ROOT/logs/EELF
+		ls -l $APP_ROOT/logs/ONAP
 		echo "------------ tail -100 error.log ---------------"
-		tail -100  $APP_ROOT/logs/EELF/error.log
+		tail -100  $APP_ROOT/logs/ONAP/error.log
 		echo "------------ tail -100 server.log ---------------"
-		tail -100  $APP_ROOT/logs/EELF/server.log
+		tail -100  $APP_ROOT/logs/ONAP/server.log
 		echo "------------ tail -100 application.log ---------------"
-		tail -100 $APP_ROOT/logs/EELF/application.log
+		tail -100 $APP_ROOT/logs/ONAP/application.log
 
 		echo "Check $APP_ROOT/ok_to_exit"
 		while [ ! -f $APP_ROOT/ok_to_exit ]