openstack/devstack
Code Issues Proposed changes

Merge "Switch to mkisofs for openSUSE distributions"

Browse Source
This commit is contained in:
Zuul 2018-04-13 11:17:04 +00:00 committed by Gerrit Code Review
commit 219184504c
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/rpms-suse/general
View File

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

2
files/rpms-suse/n-cpu
View File

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

2
files/rpms-suse/nova
View File

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

6
lib/nova
View File

@ -506,6 +506,12 @@ function create_nova_conf {
if [ "$FORCE_CONFIG_DRIVE" != "False" ]; then if [ "$FORCE_CONFIG_DRIVE" != "False" ]; then
iniset $NOVA_CONF DEFAULT force_config_drive "$FORCE_CONFIG_DRIVE" iniset $NOVA_CONF DEFAULT force_config_drive "$FORCE_CONFIG_DRIVE"
fi 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 # Format logging
setup_logging $NOVA_CONF setup_logging $NOVA_CONF