diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-15 14:02:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-15 14:02:57 +0000 |
| commit | 2f66efdf5e2cef7cf5ca8b44759003c14a103ecf (patch) | |
| tree | 6f3a7cb6ac940ee6e376552250f4524ce9b9125b /docker/glance/glance-api | |
| parent | 4cbb9a5bfdd906c6ebc4c2fc5b0ac4431602bee4 (diff) | |
| parent | 53443c5c712f4ec23b859105e94bcd90abc27762 (diff) | |
| download | kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.tar.gz kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.zip | |
Merge "Remove support for CentOS 7"
Diffstat (limited to 'docker/glance/glance-api')
| -rw-r--r-- | docker/glance/glance-api/Dockerfile.j2 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 5f6635faa..7b42c8d12 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -8,12 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% 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 %} - {% set glance_api_packages = glance_api_packages + ['nfs-utils'] %} + {% set glance_api_packages = ['qemu-img'] %} {% elif base_package_type == 'deb' %} {% set glance_api_packages = [ 'nfs-common', |
