summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordglFromAtt <dgl@research.att.com>2018-10-16 20:36:59 +0000
committerdglFromAtt <dgl@research.att.com>2018-10-16 20:37:07 +0000
commit22434bf13b3ebbb78c996f712d6dd80304c0c3f2 (patch)
treee8e42f06ef4b0449db328673046687e90967a4dd
parent7b7126fc19b2fb9e708d77361c37e4d3bcfb82ef (diff)
Reference proper config directory
Change-Id: I3cbe5f7dce7ab1da531eec507dccf6396be3ecf6 Signed-off-by: dglFromAtt <dgl@research.att.com> Issue-ID: DMAAP-829
-rw-r--r--misc/dmaapbc5
1 files changed, 2 insertions, 3 deletions
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