diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-30 20:13:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-30 20:13:03 +0000 |
| commit | e97239f03e734195a49b383f0e77aae3bdea9a35 (patch) | |
| tree | 6e642b2c4dc807e60d5b3ba84d0d5defa6b9a8ca /docker/glance | |
| parent | 63ad9cd0de0926f401a7f26bff505b1629f2e520 (diff) | |
| parent | 4b4e26262b9e03190c639481fb60a8f4f92c532a (diff) | |
| download | kolla-e97239f03e734195a49b383f0e77aae3bdea9a35.tar.gz kolla-e97239f03e734195a49b383f0e77aae3bdea9a35.zip | |
Merge "CentOS 8: Update packages in images"
Diffstat (limited to 'docker/glance')
| -rw-r--r-- | docker/glance/glance-api/Dockerfile.j2 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 9ac24070a..1b98f1efe 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -5,10 +5,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if base_distro in ['centos'] %} - {% set glance_api_packages = ['qemu-img-ev'] %} -{% elif base_distro == 'rhel' %} +{% if base_package_type == 'rpm' %} + {% if distro_package_manager == 'dnf' or base_distro not in ['centos'] %} {% set glance_api_packages = ['qemu-img'] %} + {% else %} + {% set glance_api_packages = ['qemu-img-ev'] %} + {% endif %} {% elif base_package_type == 'deb' %} {% set glance_api_packages = ['qemu-utils'] %} {% endif %} |