diff options
Diffstat (limited to 'docker/glance/glance-base')
| -rw-r--r-- | docker/glance/glance-base/Dockerfile.j2 | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index f63e89936..b5d6d00c7 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -14,21 +14,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} {% set glance_base_packages = [ - 'openstack-glance' - ] %} - {% if distro_python_version.startswith('3') %} - {% set glance_base_packages = glance_base_packages + [ + 'openstack-glance', 'python3-oslo-vmware', 'python3-rados', 'python3-rbd' ] %} - {% else %} - {% set glance_base_packages = glance_base_packages + [ - 'python-oslo-vmware', - 'python-rados', - 'python-rbd' - ] %} - {% endif %} {% elif base_package_type == 'deb' %} {% set glance_base_packages = [ 'glance', @@ -36,8 +26,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-oslo.vmware', 'python3-rados', 'python3-rbd', - 'python3-rados', - 'python3-rbd' ] %} {% endif %} @@ -45,17 +33,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif install_type == 'source' %} {% if base_package_type == 'rpm' %} - {% if distro_python_version.startswith('3') %} {% set glance_base_packages = [ 'python3-rados', 'python3-rbd' ] %} - {% else %} - {% set glance_base_packages = [ - 'python-rados', - 'python-rbd' - ] %} - {% endif %} {% elif base_package_type == 'deb' %} {% set glance_base_packages = [ 'python3-rados', |
