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/cinder/cinder-base | |
| 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/cinder/cinder-base')
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 63 |
1 files changed, 18 insertions, 45 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 08b4ec51d..9503163b3 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -11,49 +11,24 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.enable_extra_repos(['ceph']) }} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set cinder_base_packages = [ - 'ceph-common', - 'lvm2', - 'cryptsetup', - 'openstack-cinder', - 'python3-automaton', - 'python3-oslo-vmware' - ] %} - {% elif base_package_type == 'deb' %} - {% set cinder_base_packages = [ - 'ceph-common', - 'cinder-common', - 'lvm2', - 'cryptsetup', - 'python3-cephfs', - 'python3-oslo.vmware', - 'python3-rados', - 'python3-rbd' - ] %} - {% endif %} -{{ macros.install_packages(cinder_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - {% set cinder_base_packages = [ - 'ceph-common', - 'cryptsetup', - 'lvm2', - 'qemu-img' - ] %} - {% elif base_package_type == 'deb' %} - {% set cinder_base_packages = [ - 'ceph-common', - 'lvm2', - 'cryptsetup', - 'python3-cephfs', - 'python3-rados', - 'python3-rbd', - 'qemu-utils' - ] %} - {% endif %} +{% if base_package_type == 'rpm' %} + {% set cinder_base_packages = [ + 'ceph-common', + 'cryptsetup', + 'lvm2', + 'qemu-img' + ] %} +{% elif base_package_type == 'deb' %} + {% set cinder_base_packages = [ + 'ceph-common', + 'lvm2', + 'cryptsetup', + 'python3-cephfs', + 'python3-rados', + 'python3-rbd', + 'qemu-utils' + ] %} +{% endif %} {{ macros.install_packages(cinder_base_packages | customizable("packages")) }} {% set cinder_base_pip_packages = [ @@ -68,8 +43,6 @@ RUN ln -s cinder-base-source/* cinder \ && chown -R cinder: /etc/cinder \ && 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/cinder/rootwrap.conf -{% endif %} - COPY cinder_sudoers /etc/sudoers.d/kolla_cinder_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start |