From: Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Date: Fri, 13 Apr 2018 02:14:34 +0000 (+0000)
Subject: Merge "Ensure sdnctl user/schema created on master MySQL"
X-Git-Tag: 2.0.0-ONAP~276
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8cb27a420a63aa864543d207754d90816eb713fa;hp=-c;p=oom.git

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

8cb27a420a63aa864543d207754d90816eb713fa
diff --combined kubernetes/sdnc/resources/config/bin/startODL.sh
index aa50cdae29,3e0df2f394..0c41d3e3e0
--- a/kubernetes/sdnc/resources/config/bin/startODL.sh
+++ b/kubernetes/sdnc/resources/config/bin/startODL.sh
@@@ -27,8 -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 +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,10 -87,6 +87,10 @@@ the
  
          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