openstack/devstack
Code Issues Proposed changes

Merge "Fix mysqladmin failure for Fedora 34 and mariadb"

Browse Source
This commit is contained in:
Zuul 2022-01-04 19:23:59 +00:00 committed by Gerrit Code Review
commit 3c98c21fec
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.zuul.yaml
View File

@ -725,6 +725,8 @@
description: Fedora latest platform test description: Fedora latest platform test
nodeset: devstack-single-node-fedora-latest nodeset: devstack-single-node-fedora-latest
voting: false voting: false
vars:
configure_swap_size: 4096
- job: - job:
name: devstack-platform-fedora-latest-virt-preview name: devstack-platform-fedora-latest-virt-preview
@ -733,6 +735,7 @@
nodeset: devstack-single-node-fedora-latest nodeset: devstack-single-node-fedora-latest
voting: false voting: false
vars: vars:
configure_swap_size: 4096
devstack_localrc: devstack_localrc:
ENABLE_FEDORA_VIRT_PREVIEW_REPO: true ENABLE_FEDORA_VIRT_PREVIEW_REPO: true

2
lib/databases/mysql
View File

@ -178,7 +178,7 @@ EOF
if is_oraclelinux; then if is_oraclelinux; then
install_package mysql-community-server install_package mysql-community-server
elif is_fedora; then elif is_fedora; then
install_package mariadb-server mariadb-devel install_package mariadb-server mariadb-devel mariadb
sudo systemctl enable $MYSQL_SERVICE_NAME sudo systemctl enable $MYSQL_SERVICE_NAME
elif is_suse; then elif is_suse; then
install_package mariadb-server install_package mariadb-server