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/placement | |
| 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/placement')
| -rw-r--r-- | docker/placement/placement-api/Dockerfile.j2 | 26 | ||||
| -rw-r--r-- | docker/placement/placement-base/Dockerfile.j2 | 36 |
2 files changed, 9 insertions, 53 deletions
diff --git a/docker/placement/placement-api/Dockerfile.j2 b/docker/placement/placement-api/Dockerfile.j2 index c91179c59..76e1459be 100644 --- a/docker/placement/placement-api/Dockerfile.j2 +++ b/docker/placement/placement-api/Dockerfile.j2 @@ -7,31 +7,9 @@ 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 placement_api_packages = [ - 'openstack-placement-api' - ] %} - -{{ macros.install_packages(placement_api_packages | customizable("packages")) }} - - {% elif base_package_type == 'deb' %} - - {% set placement_api_packages = [ - 'placement-api' - ] %} - -{{ macros.install_packages(placement_api_packages | customizable("packages")) }} -RUN rm -f /etc/apache2/sites-enabled/placement-api.conf - - {% endif %} -{% elif install_type == 'source' %} - - {% set placement_api_packages = [ - ] %} +{% set placement_api_packages = [ +] %} {{ macros.install_packages(placement_api_packages | customizable("packages")) }} -{% endif %} COPY extend_start.sh /usr/local/bin/kolla_placement_extend_start diff --git a/docker/placement/placement-base/Dockerfile.j2 b/docker/placement/placement-base/Dockerfile.j2 index 55ca9d141..b2230f0f4 100644 --- a/docker/placement/placement-base/Dockerfile.j2 +++ b/docker/placement/placement-base/Dockerfile.j2 @@ -9,37 +9,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='placement') }} -{% if install_type == 'binary' %} +{% if base_package_type == 'rpm' %} - {% if base_package_type == 'rpm' %} + {% set placement_base_packages = [ + ] %} - {% set placement_base_packages = [ - 'openstack-placement-common', - ] %} +{% elif base_package_type == 'deb' %} - {% elif base_package_type == 'deb' %} + {% set placement_base_packages = [ + ] %} - {% set placement_base_packages = [ - 'placement-common', - ] %} - - {% endif %} - -{{ macros.install_packages(placement_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - - {% if base_package_type == 'rpm' %} - - {% set placement_base_packages = [ - ] %} - - {% elif base_package_type == 'deb' %} - - {% set placement_base_packages = [ - ] %} - - {% endif %} +{% endif %} {{ macros.install_packages(placement_base_packages | customizable("packages")) }} @@ -56,8 +36,6 @@ RUN ln -s placement-base-source/* placement \ && cp -r /placement/etc/placement/* /etc/placement/ \ && chown -R placement: /etc/placement/ -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_placement_extend_start \ |