commit 3c98c21fec60da8d2d39df2e1d9b845a51817a0e
author Zuul <zuul@review.opendev.org> Tue Jan 04 19:23:59 2022 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jan 04 19:23:59 2022 +0000
tree b126d3fbf9f157f5c5cb6fa86e4508c7d89eca79
parent 0486d4ccf382127c9091ca369b1686ee17e8f2c5
parent c1a75c6a504d720e9d46f924f5c3da07fddfee72

Merge "Fix mysqladmin failure for Fedora 34 and mariadb"

.zuul.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index d76403a..248a56b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -725,6 +725,8 @@
     description: Fedora latest platform test
     nodeset: devstack-single-node-fedora-latest
     voting: false
+    vars:
+      configure_swap_size: 4096
 
 - job:
     name: devstack-platform-fedora-latest-virt-preview
@@ -733,6 +735,7 @@
     nodeset: devstack-single-node-fedora-latest
     voting: false
     vars:
+      configure_swap_size: 4096
       devstack_localrc:
         ENABLE_FEDORA_VIRT_PREVIEW_REPO: true
 

lib/databases/mysql

diff --git a/lib/databases/mysql b/lib/databases/mysql
index d0fa119..8edbf8c 100644
--- a/lib/databases/mysql
+++ b/lib/databases/mysql
@@ -178,7 +178,7 @@
     if is_oraclelinux; then
         install_package mysql-community-server
     elif is_fedora; then
-        install_package mariadb-server mariadb-devel
+        install_package mariadb-server mariadb-devel mariadb
         sudo systemctl enable $MYSQL_SERVICE_NAME
     elif is_suse; then
         install_package mariadb-server