summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-06 00:42:43 +0000
committerGerrit Code Review <review@openstack.org>2019-02-06 00:42:43 +0000
commit12aaa23440692b50adbc197194e1a4913044b521 (patch)
tree8322fb29418c23d9c3dcb35afc8d32d2bda81e0b
parent12467ec408c5e5235c48d0568e6f0e6627fbb06e (diff)
parentd6bbeabb5c5c35eb9ada92656c9b65fbef8aff07 (diff)
Merge "Fix installation of mkisofs on SUSE Linux Enterprise 12"
-rw-r--r--files/rpms-suse/n-cpu3
-rw-r--r--files/rpms-suse/nova4
2 files changed, 5 insertions, 2 deletions
diff --git a/files/rpms-suse/n-cpu b/files/rpms-suse/n-cpu
index c11e9f0..9c724cb 100644
--- a/files/rpms-suse/n-cpu
+++ b/files/rpms-suse/n-cpu
@@ -1,8 +1,9 @@
1cdrkit-cdrtools-compat # dist:sle12
1cryptsetup 2cryptsetup
2dosfstools 3dosfstools
3libosinfo 4libosinfo
4lvm2 5lvm2
5mkisofs 6mkisofs # not:sle12
6open-iscsi 7open-iscsi
7sg3_utils 8sg3_utils
8# Stuff for diablo volumes 9# Stuff for diablo volumes
diff --git a/files/rpms-suse/nova b/files/rpms-suse/nova
index 4103a40..1d58121 100644
--- a/files/rpms-suse/nova
+++ b/files/rpms-suse/nova
@@ -1,3 +1,4 @@
1cdrkit-cdrtools-compat # dist:sle12
1conntrack-tools 2conntrack-tools
2curl 3curl
3dnsmasq 4dnsmasq
@@ -11,7 +12,8 @@ kvm # NOPRIME
11libvirt # NOPRIME 12libvirt # NOPRIME
12libvirt-python # NOPRIME 13libvirt-python # NOPRIME
13mariadb # NOPRIME 14mariadb # NOPRIME
14mkisofs # required for config_drive 15# mkisofs is required for config_drive
16mkisofs # not:sle12
15parted 17parted
16polkit 18polkit
17# qemu as fallback if kvm cannot be used 19# qemu as fallback if kvm cannot be used