diff options
Diffstat (limited to 'docker/glance')
| -rw-r--r-- | docker/glance/glance-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/glance/glance-base/Dockerfile.j2 | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 200153f54..2eff6e383 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set glance_api_packages = ['qemu-img-ev'] %} {% elif base_distro == 'rhel' %} {% set glance_api_packages = ['qemu-img'] %} -{% elif base_distro in ['debian', 'ubuntu'] %} +{% elif base_package_type == 'deb' %} {% set glance_api_packages = ['qemu-utils'] %} {% endif %} diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index b379e4008..06f8947c9 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -8,14 +8,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='glance') }} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_package_type == 'rpm' %} {% set glance_base_packages = [ 'openstack-glance', 'python-oslo-vmware', 'python-rados', 'python-rbd' ] %} - {% elif base_distro in ['debian', 'ubuntu'] %} + {% elif base_package_type == 'deb' %} {% set glance_base_packages = [ 'glance', 'python-os-brick', |
