summaryrefslogtreecommitdiffstats
path: root/odlsli/src/main/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'odlsli/src/main/scripts')
-rw-r--r--odlsli/src/main/scripts/installCcsdkFeatures.sh13
-rw-r--r--odlsli/src/main/scripts/startODL.sh16
2 files changed, 15 insertions, 14 deletions
diff --git a/odlsli/src/main/scripts/installCcsdkFeatures.sh b/odlsli/src/main/scripts/installCcsdkFeatures.sh
index 1ae108b2..4ee03e39 100644
--- a/odlsli/src/main/scripts/installCcsdkFeatures.sh
+++ b/odlsli/src/main/scripts/installCcsdkFeatures.sh
@@ -55,11 +55,14 @@ CCSDK_NORTHBOUND_VERSION=${CCSDK_NORTHBOUND_VERSION:-0.0.1-SNAPSHOT}
CCSDK_PLUGINS_VERSION=${CCSDK_PLUGINS_VERSION:-0.0.1-SNAPSHOT}
echo "Enabling core features"
-${ODL_HOME}/bin/client feature:install odl-mdsal-all
-${ODL_HOME}/bin/client feature:install odl-mdsal-apidocs
-${ODL_HOME}/bin/client feature:install odl-restconf-all
-
-
+${ODL_HOME}/bin/client feature:install odl-restconf-all odl-mdsal-all odl-mdsal-apidocs
+
+# Remove etc/host.key if it exists to work around
+# issue with client authentication
+if [ -f ${ODL_HOME}/etc/host.key ]
+then
+ rm ${ODL_HOME}/etc/host.key
+fi
echo "Installing CCSDK sli/core"
diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh
index 3e528216..568e179a 100644
--- a/odlsli/src/main/scripts/startODL.sh
+++ b/odlsli/src/main/scripts/startODL.sh
@@ -30,11 +30,6 @@ CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
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
@@ -51,7 +46,10 @@ 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 ]
@@ -60,9 +58,9 @@ then
${CCSDK_HOME}/svclogic/bin/install.sh
fi
+ echo "Restarting OpenDaylight"
+ ${ODL_HOME}/bin/stop
echo "Installed at `date`" > ${CCSDK_HOME}/.installed
fi
-# Wait on java
-pid=$(ps auxwww | grep java | grep -v grep | awk '{print $2}')
-exec tail --pid=$pid -f /dev/null
+exec ${ODL_HOME}/bin/karaf