Browse code

Merge "Cleanup rpm-distro mariadb install"

Zuul authored on 2020/04/22 20:06:00
Showing 4 changed files
... ...
@@ -5,7 +5,6 @@ ebtables
5 5
 haproxy # to serve as metadata proxy inside router/dhcp namespaces
6 6
 iptables
7 7
 iputils
8
-mariadb # NOPRIME
9 8
 rabbitmq-server # NOPRIME
10 9
 radvd # NOPRIME
11 10
 sqlite3
... ...
@@ -11,7 +11,6 @@ kpartx
11 11
 kvm # NOPRIME
12 12
 libvirt # NOPRIME
13 13
 libvirt-python # NOPRIME
14
-mariadb # NOPRIME
15 14
 # mkisofs is required for config_drive
16 15
 mkisofs # not:sle12
17 16
 parted
... ...
@@ -17,7 +17,6 @@ libjpeg-turbo-devel # Pillow 3.0.0
17 17
 libxml2-devel # lxml
18 18
 libxslt-devel # lxml
19 19
 libyaml-devel
20
-mariadb-devel  # MySQL-python
21 20
 net-tools
22 21
 openssh-server
23 22
 openssl
... ...
@@ -175,7 +175,10 @@ EOF
175 175
     # Install mysql-server
176 176
     if is_oraclelinux; then
177 177
         install_package mysql-community-server
178
-    elif is_fedora || is_suse; then
178
+    elif is_fedora; then
179
+        install_package mariadb-server mariadb-devel
180
+        sudo systemctl enable $MYSQL_SERVICE_NAME
181
+    elif is_suse; then
179 182
         install_package mariadb-server
180 183
         sudo systemctl enable $MYSQL_SERVICE_NAME
181 184
     elif is_ubuntu; then