diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-02-16 11:46:25 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-04-20 14:18:33 +0200 |
| commit | d75477142c7d110cbaf2d115b6f1b46a9a7bb6f1 (patch) | |
| tree | 79bcb1612d39d0fa0dc92a160139ca37d00f994a /docker/nova | |
| parent | 632f1774b95dbbc9c96cb46d838665362c75d934 (diff) | |
| download | kolla-d75477142c7d110cbaf2d115b6f1b46a9a7bb6f1.tar.gz kolla-d75477142c7d110cbaf2d115b6f1b46a9a7bb6f1.zip | |
nova-libvirt: handle ppc64le
Partially-Implements: blueprint multiarch-and-arm64-containers
Depends-On: I71ddb7ef57c64d2505cac96724b1ab6772a57d6a
Change-Id: I5f196a36e07ea0f253d886fddf92d1aae8afb3b2
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 504994864..7a4c26de7 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -24,31 +24,41 @@ MAINTAINER {{ maintainer }} {% set nova_libvirt_packages = [ 'ceph-common', - 'dmidecode', 'ebtables', 'libvirt-bin', 'openvswitch-switch', 'pm-utils', 'qemu', - 'qemu-block-extra', - 'xen-utils-4.6' + 'qemu-block-extra' ] %} + {% if base_arch != "ppc64le" %} + {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'dmidecode', + 'xen-utils-4.6' + ] %} + {% endif %} + {% elif base_distro in ['debian'] %} {% set nova_libvirt_packages = [ 'ceph-common', - 'dmidecode', 'ebtables', 'libvirt-clients', 'openvswitch-switch', 'pm-utils', 'qemu', 'qemu-block-extra', - 'usermode', - 'xen-utils-4.8' + 'usermode' ] %} + {% if base_arch != "ppc64le" %} + {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'dmidecode', + 'xen-utils-4.8' + ] %} + {% endif %} + {% endif %} {{ macros.install_packages(nova_libvirt_packages | customizable("packages")) }} |