From: Taka Cho <takamune.cho@att.com>
Date: Wed, 25 Mar 2020 19:07:10 +0000 (-0400)
Subject: use ODL aaa-app-config when AAF disabled
X-Git-Tag: 6.0.0~226^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9a94fefcb96dd67230ec7de1f920b4e096be10f4;p=oom.git

use ODL aaa-app-config when AAF disabled

picking up ODL default aaa-app-config.xml
file when AAF disabled.

Issue-ID: APPC-1855
Change-Id: Ic53156e3c24180a20c9b1be46d3d3a7824c468c9
Signed-off-by: Taka Cho <takamune.cho@att.com>
---

diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
index 6aad5912f4..512f38020b 100755
--- a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
+++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
@@ -139,8 +139,6 @@ then
         if $ENABLE_AAF
         then
              cp ${APPC_HOME}/data/properties/aaa-app-config.xml ${ODL_HOME}/etc/opendaylight/datastore/initial/config/aaa-app-config.xml
-        else
-             cp ${APPC_HOME}/data/aaa-app-config.xml ${ODL_HOME}/etc/opendaylight/datastore/initial/config/aaa-app-config.xml
         fi
 
 fi