openstack/devstack
Code Issues Proposed changes

On SUSE-based systems, check whether we have mariadb or mysql service

Browse Source 
Older mariadb packages on SLES 12 provided mysql.service.  The newer
ones on SLES 12 and 15 use mariadb.service; they also provide a
mysql.service symlink for backwards-compatibility, but let's not rely
on that.

Change-Id: Ife6bd007ba30af0b77d44832b19d518034bdb12b
This commit is contained in:
Adam Spiers 2019-01-24 18:57:33 +00:00
parent 8b9864d7bf
commit bc2a88d1f4
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/databases/mysql
View File

@ -16,7 +16,13 @@ MYSQL_DRIVER=${MYSQL_DRIVER:-PyMySQL}
register_database mysql register_database mysql
MYSQL_SERVICE_NAME=mysql MYSQL_SERVICE_NAME=mysql
if is_suse || is_fedora && ! is_oraclelinux; then if is_fedora && ! is_oraclelinux; then
MYSQL_SERVICE_NAME=mariadb
elif is_suse && systemctl list-unit-files | grep -q 'mariadb\.service'; then
# Older mariadb packages on SLES 12 provided mysql.service. The
# newer ones on SLES 12 and 15 use mariadb.service; they also
# provide a mysql.service symlink for backwards-compatibility, but
# let's not rely on that.
MYSQL_SERVICE_NAME=mariadb MYSQL_SERVICE_NAME=mariadb
fi fi