diff options
| author | Zuul <zuul@review.opendev.org> | 2019-07-23 21:06:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-07-23 21:06:29 +0000 |
| commit | 9ef040a85d0b7bf4f9f2b3145d648aca75f12912 (patch) | |
| tree | 894441b074175b209586d1fb9fea727bd3acfc7b /docker | |
| parent | eb20d04ed153b06e8d5f2f0e83fbcad5c271400c (diff) | |
| parent | be5b78160723adac202dc766d0c5788148606389 (diff) | |
| download | kolla-9ef040a85d0b7bf4f9f2b3145d648aca75f12912.tar.gz kolla-9ef040a85d0b7bf4f9f2b3145d648aca75f12912.zip | |
Merge "nova-libvirt: in Debian qemu-kvm is x86 only" into stable/stein
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 82aaf4b4f..fb75e443a 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -44,7 +44,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-rados', 'python3-rbd', 'qemu-block-extra', - 'qemu-kvm', 'qemu-system', 'trousers' ] %} @@ -53,6 +52,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set nova_libvirt_packages = nova_libvirt_packages + [ 'qemu-efi' ] %} + {% elif base_arch == "x86_64" %} + {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'qemu-kvm' + ] %} {% endif %} {% if base_arch != "ppc64le" %} |