Fix errors in ODL startup

Fixed errors in version of CCSDK base docker and startODL.sh script
that caused problems starting up SDNC controller container.

Issue-ID: SDNC-1855
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I02e4010d163ab18428a5f79343cb9a2e96bd4e3c

diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index 7de8e50..2d9f749 100755 (executable)
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -366,7 +366,7 @@ if $SDNC_DB_INIT; then
 # Wait for database
 #
   printf "Waiting for mysql"
-  until mysql -h dbhost -u root -p"${MYSQL_ROOT_PASSWORD}" -e "select 1" > /dev/null 2>&1
+  until mysql --skip-ssl -h dbhost -u root -p"${MYSQL_ROOT_PASSWORD}" -e "select 1" > /dev/null 2>&1
   do
     printf "."
     sleep 1

diff --git a/pom.xml b/pom.xml
index fab09bc..052fc75 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -33,10 +33,10 @@
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.bierman.api.version>1.0.0</ccsdk.bierman.api.version>
         <!-- docker images versions -->
-        <ccsdk.docker.alpine.j11.version>2.0.1</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
-        <ccsdk.docker.odlsli.alpine.version>2.0.1</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc -->
-        <ccsdk.docker.ansible.server.version>2.0.1</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
-        <ccsdk.docker.ubuntu.version>2.0.1</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->
+        <ccsdk.docker.alpine.j11.version>2.1.0</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
+        <ccsdk.docker.odlsli.alpine.version>2.1.0</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc -->
+        <ccsdk.docker.ansible.server.version>2.1.0</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
+        <ccsdk.docker.ubuntu.version>2.1.0</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->
     </properties>
 
     <modules>