From 3c9c72bad0b1ed4b61a5ed02a36c01c1455dc9bf Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Sat, 23 Mar 2019 10:16:19 +0000
Subject: [PATCH] MariaDB upgrade: specify host and port

While mysql_upgrade seems to work on CentOS images without specifying a
host and port, it fails on Ubuntu without these.

Change-Id: Ie140de57c4fe2f2e4db6a90c18e3535d9cc71ff2
Related-Bug: #1820325
---
 docker/mariadb/extend_start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/mariadb/extend_start.sh b/docker/mariadb/extend_start.sh
index 88be89d025..c07c00a9e9 100644
--- a/docker/mariadb/extend_start.sh
+++ b/docker/mariadb/extend_start.sh
@@ -47,7 +47,7 @@ if [[ "${!KOLLA_UPGRADE[@]}" ]]; then
     # There doesn't seem to be anything in the directory, so remove it.
     rm -rf /var/lib/mysql/.pki
 
-    mysql_upgrade --user=root --password="${DB_ROOT_PASSWORD}"
+    mysql_upgrade --host=${DB_HOST} --port=${DB_PORT} --user=root --password="${DB_ROOT_PASSWORD}"
     exit 0
 fi