Fix ODL restart issue

[ccsdk/distribution.git] / odlsli / src / main / scripts / installCcsdkFeatures.sh

diff --git a/odlsli/src/main/scripts/installCcsdkFeatures.sh b/odlsli/src/main/scripts/installCcsdkFeatures.sh
index 9aff1d8..4ee03e3 100644 (file)
--- a/odlsli/src/main/scripts/installCcsdkFeatures.sh
+++ b/odlsli/src/main/scripts/installCcsdkFeatures.sh
@@ -29,8 +29,8 @@ CCSDK_FEATURE_DIR=${CCSDK_FEATURE_DIR:-${CCSDK_HOME}/features}
 CCSDK_CORE_FEATURES=" \
  slicore-utils \
  dblib \
- filters \
  sli \
+ filters \
  sliPluginUtils \
  sliapi"
 
@@ -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"
@@ -69,7 +72,7 @@ do
   then
     ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh
   else
-    echo "No installer found for feature sdnc-${feature}"
+    echo "No installer found for feature ccsdk-${feature}"
   fi
 done
 
@@ -87,11 +90,11 @@ done
 echo "Installing CCSDK sli/northbound"
 for feature in ${CCSDK_NORTHBOUND_FEATURES}
 do
-  if [ -f ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ]
+  if [ -f ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh ]
   then
-    ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh
+    ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh
   else
-    echo "No installer found for feature sdnc-${feature}"
+    echo "No installer found for feature ccsdk-${feature}"
   fi
 done
 
@@ -99,10 +102,10 @@ done
 echo "Installing CCSDK sli/plugins"
 for feature in ${CCSDK_PLUGINS_FEATURES}
 do
-  if [ -f ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ]
+  if [ -f ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh ]
   then
-    ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh
+    ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh
   else
-    echo "No installer found for feature sdnc-${feature}"
+    echo "No installer found for feature ccsdk-${feature}"
   fi
 done