summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-08-28 03:34:34 +0000
committerGerrit Code Review <review@openstack.org>2020-08-28 03:34:34 +0000
commit1be0a430f5c004cd8b7f62409d767cb1a0ba6214 (patch)
treeae03964f8a8f006e40a7942280cf41fea85fbe37
parent45c263113ac64370214248644d062720c9a46dc8 (diff)
parentb54839f382b046b7ec8b9633fbea763d31d9949c (diff)
downloadkeystone-1be0a430f5c004cd8b7f62409d767cb1a0ba6214.tar.gz
Merge "Fix user creation with GRANT in MySQL 8.0(Ubuntu Focal)"
-rwxr-xr-xtools/test-setup.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index 0743c82ce..83399ec5a 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;"
# Bump the max_connections limit
sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e "