summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Bańka <k.banka@samsung.com>2020-04-06 14:19:18 +0200
committerKrzysztof Opasiak <k.opasiak@samsung.com>2020-04-06 21:57:16 +0000
commitade13cb297c47619383319758fe087c4dfa48758 (patch)
tree7dd2c8bbe32c83c98dab3abc4aac783825a85c09
parent5c76e71e5027dee7a7b3eebe88c5dff6233c0d5b (diff)
[SDNC] Correct config directories for ODL
SDNC entrypoint script sets up several environment variables including configfiles dir. Recent addition of AAF configfiles broke expected path for used properties files. This could be noticed with example error from karaf logs: org.onap.ccsdk.sli.core.sli.SvcLogicException: Cannot read property file: /opt/app/osaaf/local/generic-resource-api-dg.properties: /opt/app/osaaf/local/generic-resource-api-dg.properties (No such file or directory) Issue-ID: SDNC-1147 Signed-off-by: Konrad Bańka <k.banka@samsung.com> Change-Id: Ifcfde9abef1c12a7b8d1009f346d313b8fe57f44
-rwxr-xr-xkubernetes/sdnc/resources/config/bin/startODL.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/sdnc/resources/config/bin/startODL.sh b/kubernetes/sdnc/resources/config/bin/startODL.sh
index af5c36207c..6aa796a163 100755
--- a/kubernetes/sdnc/resources/config/bin/startODL.sh
+++ b/kubernetes/sdnc/resources/config/bin/startODL.sh
@@ -4,6 +4,7 @@
# ============LICENSE_START=======================================================
# SDNC
# ================================================================================
+# Copyright © 2020 Samsung Electronics
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -133,17 +134,17 @@ echo " AAF_ENABLED=$SDNC_AAF_ENABLED"
if $SDNC_AAF_ENABLED; then
- export SDNC_STORE_DIR=/opt/app/osaaf/local
- export SDNC_CONFIG_DIR=/opt/app/osaaf/local
+ export SDNC_AAF_STORE_DIR=/opt/app/osaaf/local
+ export SDNC_AAF_CONFIG_DIR=/opt/app/osaaf/local
export SDNC_KEYPASS=`cat /opt/app/osaaf/local/.pass`
export SDNC_KEYSTORE=org.onap.sdnc.p12
sed -i '/cadi_prop_files/d' $ODL_HOME/etc/system.properties
- echo "cadi_prop_files=$SDNC_CONFIG_DIR/org.onap.sdnc.props" >> $ODL_HOME/etc/system.properties
+ echo "cadi_prop_files=$SDNC_AAF_CONFIG_DIR/org.onap.sdnc.props" >> $ODL_HOME/etc/system.properties
sed -i '/org.ops4j.pax.web.ssl.keystore/d' $ODL_HOME/etc/custom.properties
sed -i '/org.ops4j.pax.web.ssl.password/d' $ODL_HOME/etc/custom.properties
sed -i '/org.ops4j.pax.web.ssl.keypassword/d' $ODL_HOME/etc/custom.properties
- echo org.ops4j.pax.web.ssl.keystore=$SDNC_STORE_DIR/$SDNC_KEYSTORE >> $ODL_HOME/etc/custom.properties
+ echo org.ops4j.pax.web.ssl.keystore=$SDNC_AAF_STORE_DIR/$SDNC_KEYSTORE >> $ODL_HOME/etc/custom.properties
echo org.ops4j.pax.web.ssl.password=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
echo org.ops4j.pax.web.ssl.keypassword=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
fi