Merge "Ensure sdnctl user/schema created on master MySQL"

[oom.git] / 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 ee8106c..0c41d3e 100755 (executable)
--- a/kubernetes/sdnc/resources/config/bin/startODL.sh
+++ b/kubernetes/sdnc/resources/config/bin/startODL.sh
@@ -27,8 +27,8 @@ function enable_odl_cluster(){
   fi
 
   echo "Installing Opendaylight cluster features"
-  ${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-clustering
-  ${ODL_HOME}/bin/client -u karaf feature:install odl-jolokia
+  ${ODL_HOME}/bin/client feature:install odl-mdsal-clustering
+  ${ODL_HOME}/bin/client feature:install odl-jolokia
 
   echo "Update cluster information statically"
   hm=$(hostname)
@@ -52,12 +52,13 @@ SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
 SLEEP_TIME=${SLEEP_TIME:-120}
 MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.dbRootPassword}}}
 ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
+MYSQL_HOST=${MYSQL_HOST:-{{.Release.Name}}-{{.Values.mysql.nameOverride}}-0.{{.Values.mysql.service.name}}.{{.Release.Namespace}}}
 
 #
 # Wait for database to init properly
 #
 echo "Waiting for mysql"
-until mysql -h {{.Values.mysql.service.name}}.{{.Release.Namespace}} -u root -p{{.Values.config.dbRootPassword}} mysql &> /dev/null
+until mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWD} mysql &> /dev/null
 do
   printf "."
   sleep 1
@@ -86,6 +87,10 @@ then
 
         echo "Restarting OpenDaylight"
         ${ODL_HOME}/bin/stop
+
+        echo "Waiting 60 seconds for OpenDaylight stop to complete"
+        sleep 60
+
         echo "Installed at `date`" > ${SDNC_HOME}/.installed
 fi