From 812e7846c99e6e4445fdd115a6440fe999730bc1 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 17 Apr 2020 09:25:22 +1000 Subject: [PATCH] Cleanup rpm-distro mariadb install We have lib/databases/mysql which is installing databases, remove it from the bulk package lists. Split is_fedora (fedora & centos8 -- soon) to install mariadb-server and mariadb-devel to retain status-quo. On suse this seems to be a meta-package 'mariadb-server' not found in package names. Trying capabilities. so split that out. It seems it has never been installing the -devel package, and things work (presumably clients are coming from wheels so don't need to build against it). Change-Id: I86433318e8f76c40c5c792b795411a5c9d8351d3 --- files/rpms-suse/neutron-common | 1 - files/rpms-suse/nova | 1 - files/rpms/general | 1 - lib/databases/mysql | 5 ++++- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/files/rpms-suse/neutron-common b/files/rpms-suse/neutron-common index d1cc73f115..e3799a9353 100644 --- 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 diff --git a/files/rpms-suse/nova b/files/rpms-suse/nova index 1d5812146b..9923760750 100644 --- 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 diff --git a/files/rpms/general b/files/rpms/general index 361416a910..b150a570b4 100644 --- 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 diff --git a/lib/databases/mysql b/lib/databases/mysql index e5865f2a69..d4969d713c 100644 --- 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