Merge "Cleanup rpm-distro mariadb install"

2020-04-22 11:06:00 +00:00 · 2020-04-22 11:06:00 +00:00 · 125ed50794
commit 125ed50794
parent 95d3d7a5fc 812e7846c9
4 changed files with 4 additions and 4 deletions
--- a/files/rpms-suse/neutron-common
+++ b/files/rpms-suse/neutron-common
@ -5,7 +5,6 @@ ebtables
 haproxy # to serve as metadata proxy inside router/dhcp namespaces
 iptables
 iputils
-mariadb # NOPRIME
 rabbitmq-server # NOPRIME
 radvd # NOPRIME
 sqlite3
--- a/files/rpms-suse/nova
+++ b/files/rpms-suse/nova
@ -11,7 +11,6 @@ kpartx
 kvm # NOPRIME
 libvirt # NOPRIME
 libvirt-python # NOPRIME
-mariadb # NOPRIME
 # mkisofs is required for config_drive
 mkisofs # not:sle12
 parted
--- a/files/rpms/general
+++ b/files/rpms/general
@ -17,7 +17,6 @@ libjpeg-turbo-devel # Pillow 3.0.0
 libxml2-devel # lxml
 libxslt-devel # lxml
 libyaml-devel
-mariadb-devel  # MySQL-python
 net-tools
 openssh-server
 openssl
--- a/lib/databases/mysql
+++ b/lib/databases/mysql
@ -175,7 +175,10 @@ EOF
    # Install mysql-server
    if is_oraclelinux; then
        install_package mysql-community-server
-    elif is_fedora || is_suse; then
+    elif is_fedora; then
+        install_package mariadb-server mariadb-devel
+        sudo systemctl enable $MYSQL_SERVICE_NAME
+    elif is_suse; then
        install_package mariadb-server
        sudo systemctl enable $MYSQL_SERVICE_NAME
    elif is_ubuntu; then