Fix odlsli restart issue 91/34991/2
authorTimoney, Dan (dt5972) <dt5972@att.com>
Fri, 9 Mar 2018 20:46:21 +0000 (15:46 -0500)
committerTimoney, Dan (dt5972) <dt5972@att.com>
Mon, 12 Mar 2018 20:24:38 +0000 (16:24 -0400)
Instead of restarting container (which seems to fail),
just start karaf client in foreground at end of startODL.sh
to cause docker container to stay up as long as karaf is up.

Also, remove Carbon container which is no longer needed for ONAP Beijing,
and produces false positives in security scan.

Change-Id: I8ea49769899cea206f46657bf6a3660d6a8a8d97
Issue-ID: CCSDK-208
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
odlsli/src/main/scripts/startODL.sh
opendaylight/pom.xml

index 70341af..75f51b3 100644 (file)
@@ -5,7 +5,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-#                                                      reserved.
+#                             reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,6 +30,12 @@ CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
 SLEEP_TIME=${SLEEP_TIME:-120}
 MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0}
 
 SLEEP_TIME=${SLEEP_TIME:-120}
 MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0}
 
+# Start karaf
+echo "Starting OpenDaylight"
+${ODL_HOME}/bin/start
+echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
+sleep ${SLEEP_TIME}
+
 #
 # Wait for database
 #
 #
 # Wait for database
 #
@@ -43,26 +49,19 @@ echo -e "\nmysql ready"
 
 if [ ! -f ${CCSDK_HOME}/.installed ]
 then
 
 if [ ! -f ${CCSDK_HOME}/.installed ]
 then
-       echo "Installing SDN-C database"
-       ${CCSDK_HOME}/bin/installSdncDb.sh
-       echo "Starting OpenDaylight"
-       ${ODL_HOME}/bin/start
-       echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
-       sleep ${SLEEP_TIME}
-       echo "Installing SDN-C platform features"
-       ${CCSDK_HOME}/bin/installFeatures.sh
-       if [ -x ${CCSDK_HOME}/svclogic/bin/install.sh ]
-       then
-               echo "Installing directed graphs"
-               ${CCSDK_HOME}/svclogic/bin/install.sh
-       fi
+    echo "Installing SDN-C database"
+    ${CCSDK_HOME}/bin/installSdncDb.sh
 
 
+    echo "Installing SDN-C platform features"
+    ${CCSDK_HOME}/bin/installFeatures.sh
+    if [ -x ${CCSDK_HOME}/svclogic/bin/install.sh ]
+    then
+        echo "Installing directed graphs"
+        ${CCSDK_HOME}/svclogic/bin/install.sh
+    fi
 
 
-       echo "Restarting OpenDaylight"
-       ${ODL_HOME}/bin/stop
-       echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to stop"
-       sleep ${SLEEP_TIME}
-       echo "Installed at `date`" > ${CCSDK_HOME}/.installed
+    echo "Installed at `date`" > ${CCSDK_HOME}/.installed
 fi
 
 fi
 
-exec ${ODL_HOME}/bin/karaf server
+# Start client to force a wait on state of karaf server
+${ODL_HOME}/bin/client
index d7cc1ed..04916a5 100644 (file)
@@ -16,7 +16,6 @@
     <description>Creates OpenDaylight container</description>
 
     <modules>
     <description>Creates OpenDaylight container</description>
 
     <modules>
-           <module>carbon</module>
            <module>nitrogen</module>
     </modules>
 </project>
            <module>nitrogen</module>
     </modules>
 </project>

© 2017 ONAP. Copyright © The Linux Foundation ®. All Rights Reserved.
The Linux Foundation has registered trademarks and uses trademarks.
For a list of trademarks of The Linux Foundation, please see our Trademark Usage page.
Linux is a registered trademark of Linus Torvalds.
Privacy Policy and Terms of Use