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

@@ -1,7 +1,7 @@

 cryptsetup

-genisoimage

 libosinfo

 lvm2

+mkisofs

 open-iscsi

 sg3_utils

 # Stuff for diablo volumes

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

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