diff options
| author | Zuul <zuul@review.openstack.org> | 2018-06-04 10:39:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-06-04 10:39:19 +0000 |
| commit | 5caa5e30de05f5879fe56c3b0cb56329c8116d87 (patch) | |
| tree | fb48538e55cee16d6211f00b1f9aa2384d63eec7 /docker/nova/nova-libvirt | |
| parent | 9ef9cbeb8f3504a4d80716e5e6ae7e9e6bb372d6 (diff) | |
| parent | 14374e715d2a5057a28126c7193cfb6270eabaab (diff) | |
| download | kolla-5caa5e30de05f5879fe56c3b0cb56329c8116d87.tar.gz kolla-5caa5e30de05f5879fe56c3b0cb56329c8116d87.zip | |
Merge "Bump Ubuntu base image to 18.04"
Diffstat (limited to 'docker/nova/nova-libvirt')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 6b4e05398..49ab79291 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -44,6 +44,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_arch != "ppc64le" %} {% set nova_libvirt_packages = nova_libvirt_packages + [ 'dmidecode', + 'xen-utils' ] %} {% endif %} @@ -52,17 +53,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'libpam-systemd/stretch-backports', 'usermode' ] %} - {% if base_arch != "ppc64le" %} - {% set nova_libvirt_packages = nova_libvirt_packages + [ - 'xen-utils-4.8' - ] %} - {% endif %} - {% elif base_distro in ['ubuntu'] %} - {% if base_arch != "ppc64le" %} - {% set nova_libvirt_packages = nova_libvirt_packages + [ - 'xen-utils-4.6' - ] %} - {% endif %} {% endif %} {% endif %} |