From: dglFromAtt <dgl@research.att.com>
Date: Tue, 16 Oct 2018 20:36:59 +0000 (+0000)
Subject: Reference proper config directory
X-Git-Tag: 1.0.22~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fbuscontroller.git;a=commitdiff_plain;h=22434bf13b3ebbb78c996f712d6dd80304c0c3f2

Reference proper config directory

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

diff --git a/misc/dmaapbc b/misc/dmaapbc
index b2a253a..ea2a81d 100644
--- a/misc/dmaapbc
+++ b/misc/dmaapbc
@@ -32,7 +32,7 @@ export PATH
 CLASSPATH=`echo $APP_ROOT/etc $APP_ROOT/lib/*.jar | tr ' ' ':'` 
 export CLASSPATH
 CONFIGMAP_ROOT=${CONFIGMAP_ROOT:-/opt/app/config/conf}
-CONFIGMAP_PROPS=${CONFIGMAP_PROPS:-/opt/app/config/dmaapbc.properties}
+CONFIGMAP_PROPS=${CONFIGMAP_PROPS:-/opt/app/config/conf/dmaapbc.properties}
 CONTAINER_CONFIG=$CONFIGMAP_ROOT/buscontroller.env
 MAIN=org.onap.dmaap.dbcapi.server.Main 
 
@@ -53,9 +53,8 @@ config() {
 	fi
 	if [ !  -f $CONTAINER_CONFIG ]
 	then
-		echo "Expected env file $CONTAINER_CONFIG not found"
+		echo "WARNING: Expected env file $CONTAINER_CONFIG not found. Default behaviors in effect"
 		find $CONTAINER_ROOT -type f
-		exit 1
 	fi
 	cd $APP_ROOT
 	source $CONTAINER_CONFIG