Browse code

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

Zuul authored on 2019/02/14 20:23:28
Showing 1 changed files
... ...
@@ -16,7 +16,13 @@ MYSQL_DRIVER=${MYSQL_DRIVER:-PyMySQL}
16 16
 register_database mysql
17 17
 
18 18
 MYSQL_SERVICE_NAME=mysql
19
-if is_suse || is_fedora && ! is_oraclelinux; then
19
+if is_fedora && ! is_oraclelinux; then
20
+    MYSQL_SERVICE_NAME=mariadb
21
+elif is_suse && systemctl list-unit-files | grep -q 'mariadb\.service'; then
22
+    # Older mariadb packages on SLES 12 provided mysql.service.  The
23
+    # newer ones on SLES 12 and 15 use mariadb.service; they also
24
+    # provide a mysql.service symlink for backwards-compatibility, but
25
+    # let's not rely on that.
20 26
     MYSQL_SERVICE_NAME=mariadb
21 27
 fi
22 28