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
This commit is contained in:
Ian Wienand 2020-04-17 09:25:22 +10:00
parent 3cd41019b0
commit 812e7846c9
4 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -11,7 +11,6 @@ kpartx
kvm # NOPRIME
libvirt # NOPRIME
libvirt-python # NOPRIME
mariadb # NOPRIME
# mkisofs is required for config_drive
mkisofs # not:sle12
parted

View File

@ -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

View File

@ -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