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/sahara | |
| 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/sahara')
| -rw-r--r-- | docker/sahara/sahara-api/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/sahara/sahara-base/Dockerfile.j2 | 21 | ||||
| -rw-r--r-- | docker/sahara/sahara-engine/Dockerfile.j2 | 22 |
3 files changed, 4 insertions, 48 deletions
diff --git a/docker/sahara/sahara-api/Dockerfile.j2 b/docker/sahara/sahara-api/Dockerfile.j2 index 60c4cd149..aafab3ba6 100644 --- a/docker/sahara/sahara-api/Dockerfile.j2 +++ b/docker/sahara/sahara-api/Dockerfile.j2 @@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set sahara_api_packages = ['openstack-sahara-api'] %} - {% elif base_package_type == 'deb' %} - {% set sahara_api_packages = ['sahara-api'] %} - {% endif %} -{{ macros.install_packages(sahara_api_packages | customizable("packages")) }} -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_sahara_extend_start RUN chmod 755 /usr/local/bin/kolla_sahara_extend_start diff --git a/docker/sahara/sahara-base/Dockerfile.j2 b/docker/sahara/sahara-base/Dockerfile.j2 index 5d7d7a5e5..1204d4a04 100644 --- a/docker/sahara/sahara-base/Dockerfile.j2 +++ b/docker/sahara/sahara-base/Dockerfile.j2 @@ -9,25 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='sahara') }} -{% if install_type == 'binary' %} - -{% if base_package_type == 'rpm' %} - {% set sahara_base_packages = [ - 'openstack-sahara-common', - 'python3-sahara-plugin-ambari', - 'python3-sahara-plugin-cdh', - 'python3-sahara-plugin-mapr', - 'python3-sahara-plugin-spark', - 'python3-sahara-plugin-storm', - 'python3-sahara-plugin-vanilla' - ] %} -{% elif base_package_type == 'deb' %} - {% set sahara_base_packages = ['sahara-common'] %} -{% endif %} -{{ macros.install_packages(sahara_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} {% set sahara_base_packages = ['openssh'] %} {% elif base_package_type == 'deb' %} @@ -55,8 +36,6 @@ RUN ln -s sahara-base-source/* sahara \ && chown -R sahara: /etc/sahara \ && 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/sahara/rootwrap.conf -{% endif %} - COPY sahara_sudoers /etc/sudoers.d/kolla_sahara_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start diff --git a/docker/sahara/sahara-engine/Dockerfile.j2 b/docker/sahara/sahara-engine/Dockerfile.j2 index 26c0562da..02c0ca02b 100644 --- a/docker/sahara/sahara-engine/Dockerfile.j2 +++ b/docker/sahara/sahara-engine/Dockerfile.j2 @@ -7,24 +7,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set sahara_engine_packages = [ - 'nc', - 'openstack-sahara-engine', - ] %} - {% elif base_package_type == 'deb' %} - {% set sahara_engine_packages = [ - 'netcat', - 'sahara-engine', - ] %} - {% endif %} -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - {% set sahara_engine_packages = ['nc'] %} - {% elif base_package_type == 'deb' %} - {% set sahara_engine_packages = ['netcat'] %} - {% endif %} +{% if base_package_type == 'rpm' %} + {% set sahara_engine_packages = ['nc'] %} +{% elif base_package_type == 'deb' %} + {% set sahara_engine_packages = ['netcat'] %} {% endif %} {{ macros.install_packages(sahara_engine_packages | customizable("packages")) }} |
