From ade13cb297c47619383319758fe087c4dfa48758 Mon Sep 17 00:00:00 2001 From: Konrad Bańka Date: Mon, 6 Apr 2020 14:19:18 +0200 Subject: [SDNC] Correct config directories for ODL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Change-Id: Ifcfde9abef1c12a7b8d1009f346d313b8fe57f44 --- kubernetes/sdnc/resources/config/bin/startODL.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'kubernetes/sdnc/resources/config/bin/startODL.sh') 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 -- cgit 1.2.3-korg