Browse code
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
Dirk Mueller authored on 2018/04/12 04:33:50Showing 4 changed files
| ... | ... |
@@ -4,7 +4,6 @@ dnsmasq |
| 4 | 4 |
dnsmasq-utils # dist:opensuse-12.3,opensuse-13.1 |
| 5 | 5 |
ebtables |
| 6 | 6 |
gawk |
| 7 |
-genisoimage # required for config_drive |
|
| 8 | 7 |
iptables |
| 9 | 8 |
iputils |
| 10 | 9 |
kpartx |
| ... | ... |
@@ -12,6 +11,7 @@ kvm # NOPRIME |
| 12 | 12 |
libvirt # NOPRIME |
| 13 | 13 |
libvirt-python # NOPRIME |
| 14 | 14 |
mariadb # NOPRIME |
| 15 |
+mkisofs # required for config_drive |
|
| 15 | 16 |
parted |
| 16 | 17 |
polkit |
| 17 | 18 |
# qemu as fallback if kvm cannot be used |
| ... | ... |
@@ -506,6 +506,12 @@ function create_nova_conf {
|
| 506 | 506 |
if [ "$FORCE_CONFIG_DRIVE" != "False" ]; then |
| 507 | 507 |
iniset $NOVA_CONF DEFAULT force_config_drive "$FORCE_CONFIG_DRIVE" |
| 508 | 508 |
fi |
| 509 |
+ |
|
| 510 |
+ # nova defaults to genisoimage but only mkisofs is available for 15.0+ |
|
| 511 |
+ if is_suse; then |
|
| 512 |
+ iniset $NOVA_CONF DEFAULT mkisofs_cmd /usr/bin/mkisofs |
|
| 513 |
+ fi |
|
| 514 |
+ |
|
| 509 | 515 |
# Format logging |
| 510 | 516 |
setup_logging $NOVA_CONF |
| 511 | 517 |
|