diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-01 13:41:14 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-09 17:44:26 +0200 |
| commit | 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (patch) | |
| tree | 05427aa46ce6473684cfe2a824798306291546c9 /docker/glance | |
| parent | cabfd0f3eff38e2c10cdc7cf4e9271d72eeca91a (diff) | |
| download | kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.tar.gz kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.zip | |
docker: drop binary parts
Big patch drops all mentions of binary images support. Suggestions are
welcome how to split it into parts or handle better.
Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
Diffstat (limited to 'docker/glance')
| -rw-r--r-- | docker/glance/glance-base/Dockerfile.j2 | 50 |
1 files changed, 10 insertions, 40 deletions
diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index dbc19dcbc..c51a3b338 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -11,46 +11,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.enable_extra_repos(['ceph']) }} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set glance_base_packages = [ - 'openstack-glance', - 'python3-boto3', - 'python3-oslo-vmware', - 'python3-rados', - 'python3-rbd' - ] %} - {% elif base_package_type == 'deb' %} - {% set glance_base_packages = [ - 'glance', - 'python3-boto3', - 'python3-os-brick', - 'python3-oslo.vmware', - 'python3-rados', - 'python3-rbd', - ] %} - {% endif %} - -{{ macros.install_packages(glance_base_packages | customizable("packages")) }} - -{% if base_package_type == 'deb' %} -# fix up Ubuntu and Debian packaging of config (glance_store's rootwrap) -RUN ln -s /etc/glance/glance/* /etc/glance/ +{% if base_package_type == 'rpm' %} + {% set glance_base_packages = [ + 'python3-rados', + 'python3-rbd' + ] %} +{% elif base_package_type == 'deb' %} + {% set glance_base_packages = [ + 'python3-rados', + 'python3-rbd' + ] %} {% endif %} -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - {% set glance_base_packages = [ - 'python3-rados', - 'python3-rbd' - ] %} - {% elif base_package_type == 'deb' %} - {% set glance_base_packages = [ - 'python3-rados', - 'python3-rbd' - ] %} - {% endif %} - {{ macros.install_packages(glance_base_packages | customizable("packages")) }} ADD glance-base-archive /glance-base-source @@ -70,8 +42,6 @@ RUN ln -s glance-base-source/* glance \ && chown -R glance: /etc/glance \ && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/glance/rootwrap.conf -{% endif %} - COPY glance_sudoers /etc/sudoers.d/kolla_glance_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start |