diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-25 20:16:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-25 20:16:58 +0000 |
| commit | a486b18475541524dfd94aa28902e7c3ae0e1566 (patch) | |
| tree | 61fd85041a9eef50c2a89e5fc25e6ace982d2bfb /docker | |
| parent | 4d35a7671aa7b77e8e4f06d377dd11033255f28b (diff) | |
| parent | d75477142c7d110cbaf2d115b6f1b46a9a7bb6f1 (diff) | |
| download | kolla-a486b18475541524dfd94aa28902e7c3ae0e1566.tar.gz kolla-a486b18475541524dfd94aa28902e7c3ae0e1566.zip | |
Merge "nova-libvirt: handle ppc64le"
Diffstat (limited to 'docker')
| -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 738c2e44b..aba51683a 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -24,31 +24,41 @@ LABEL 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")) }} |