Switch to mkisofs for openSUSE distributions

In Tumbleweed genisoimage was dropped in favor of cdrtools,
so installing that no longer works. We can however install
mkisofs directly and switch to that as that is also available
in Leap 42.3 and Leap 15.0+ family distros.

Also drop dependency on libmysqlclient-devel which appears
unnecessary (and is no longer available with mariadb 10.2+)

Change-Id: Ie8402204b6cdf94c21865caba116d3fd1298c5ad
This commit is contained in:
Dirk Mueller 2018-04-11 21:33:50 +02:00
parent 486057f339
commit c114449bdb
4 changed files with 8 additions and 3 deletions

View File

@ -11,7 +11,6 @@ graphviz # docs
iputils
libffi-devel # pyOpenSSL
libjpeg8-devel # Pillow 3.0.0
libmysqlclient-devel # MySQL-python
libopenssl-devel # to rebuild pyOpenSSL if needed
libxslt-devel # lxml
lsof # useful when debugging

View File

@ -1,7 +1,7 @@
cryptsetup
genisoimage
libosinfo
lvm2
mkisofs
open-iscsi
sg3_utils
# Stuff for diablo volumes

View File

@ -4,7 +4,6 @@ dnsmasq
dnsmasq-utils # dist:opensuse-12.3,opensuse-13.1
ebtables
gawk
genisoimage # required for config_drive
iptables
iputils
kpartx
@ -12,6 +11,7 @@ kvm # NOPRIME
libvirt # NOPRIME
libvirt-python # NOPRIME
mariadb # NOPRIME
mkisofs # required for config_drive
parted
polkit
# qemu as fallback if kvm cannot be used

View File

@ -506,6 +506,12 @@ function create_nova_conf {
if [ "$FORCE_CONFIG_DRIVE" != "False" ]; then
iniset $NOVA_CONF DEFAULT force_config_drive "$FORCE_CONFIG_DRIVE"
fi
# nova defaults to genisoimage but only mkisofs is available for 15.0+
if is_suse; then
iniset $NOVA_CONF DEFAULT mkisofs_cmd /usr/bin/mkisofs
fi
# Format logging
setup_logging $NOVA_CONF