From 9a89c304797e8d7f2a64a0516d4aeb085abcefe3 Mon Sep 17 00:00:00 2001
From: Iury Gregory Melo Ferreira <imelofer@redhat.com>
Date: Fri, 11 Sep 2020 11:42:08 +0200
Subject: [PATCH] Fix l-c and mysql GRANT syntex for Ubuntu Focal

Also fixing user creation with GRANT in MySQL 8.0(Ubuntu Focal)
Ubuntu Focal (20.04) has mysql 8.0 and with mysql 8.0 there
is no implicit user creation with GRANT. We need to
create the user first before using GRANT command.
Change-Id: I4c0469628e82e86b4023a9b011d09f20f9b66aac
---
 lower-constraints.txt | 10 +++++-----
 requirements.txt      |  8 ++++----
 tools/test-setup.sh   |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index fb3b66cde..a87f9a28f 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -1,5 +1,5 @@
 alabaster==0.7.12
-alembic==0.9.6
+alembic==1.4.2
 amqp==2.5.2
 appdirs==1.4.4
 automaton==1.9.0
@@ -29,7 +29,7 @@ futurist==1.2.0
 gitdb==4.0.5
 GitPython==3.1.2
 greenlet==0.4.15
-grpcio==1.15.0
+grpcio==1.18.0
 idna==2.9
 ifaddr==0.1.6
 imagesize==1.2.0
@@ -64,7 +64,7 @@ os-service-types==1.7.0
 oslo.concurrency==3.26.0
 oslo.config==5.2.0
 oslo.context==2.19.2
-oslo.db==4.40.0
+oslo.db==6.0.0
 oslo.i18n==3.15.3
 oslo.log==3.36.0
 oslo.messaging==5.32.0
@@ -109,7 +109,7 @@ Sphinx==2.0.0
 sphinxcontrib-apidoc==0.2.0
 sphinxcontrib-svg2pdfconverter==0.1.0
 sphinxcontrib-websupport==1.2.2
-SQLAlchemy==1.0.10
+SQLAlchemy==1.2.19
 sqlalchemy-migrate==0.13.0
 sqlparse==0.3.1
 statsd==3.3.0
@@ -121,7 +121,7 @@ testrepository==0.0.20
 testresources==2.0.0
 testscenarios==0.4
 testtools==2.4.0
-tooz==1.64.0
+tooz==2.5.1
 traceback2==1.4.0
 unittest2==1.1.0
 urllib3==1.25.9
diff --git a/requirements.txt b/requirements.txt
index 2b97620b7..bbf3a806f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 automaton>=1.9.0 # Apache-2.0
-alembic>=0.9.6 # MIT
+alembic>=1.4.2 # MIT
 construct>=2.9.39 # MIT
 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
 Flask>=1.1.0 # BSD
@@ -20,7 +20,7 @@ openstacksdk>=0.40.0 # Apache-2.0
 oslo.concurrency>=3.26.0 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0
 oslo.context>=2.19.2 # Apache-2.0
-oslo.db>=4.40.0 # Apache-2.0
+oslo.db>=6.0.0 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
 oslo.messaging>=5.32.0 # Apache-2.0
@@ -32,5 +32,5 @@ oslo.service!=1.28.1,>=1.24.0 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
 tenacity>=6.2.0  # Apache-2.0
 stevedore>=1.20.0 # Apache-2.0
-SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
-tooz>=1.64.0 # Apache-2.0
+SQLAlchemy>=1.2.19 # MIT
+tooz>=2.5.1 # Apache-2.0
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index 07a078547..505a58cb7 100755
--- a/tools/test-setup.sh
+++ b/tools/test-setup.sh
@@ -23,8 +23,8 @@ sudo -H mysqladmin -u root password $DB_ROOT_PW
 sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e "
     DELETE FROM mysql.user WHERE User='';
     FLUSH PRIVILEGES;
-    GRANT ALL PRIVILEGES ON *.*
-        TO '$DB_USER'@'%' identified by '$DB_PW' WITH GRANT OPTION;"
+    CREATE USER '$DB_USER'@'%' IDENTIFIED BY '$DB_PW';
+    GRANT ALL PRIVILEGES ON *.* TO '$DB_USER'@'%' WITH GRANT OPTION;"
 
 # Now create our database.
 mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e "