diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-11 09:39:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-11 09:39:28 +0000 |
| commit | 657820362dd0b52f8462054e043fd892d14fbe76 (patch) | |
| tree | d2675f8f172c08febc6f1eaf9900deec7b43c8ee /docker/tacker | |
| parent | 26fd382f176adbc104850f565df238253d8f9fc7 (diff) | |
| parent | 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (diff) | |
| download | kolla-657820362dd0b52f8462054e043fd892d14fbe76.tar.gz kolla-657820362dd0b52f8462054e043fd892d14fbe76.zip | |
Merge "docker: drop binary parts"
Diffstat (limited to 'docker/tacker')
| -rw-r--r-- | docker/tacker/tacker-base/Dockerfile.j2 | 21 | ||||
| -rw-r--r-- | docker/tacker/tacker-conductor/Dockerfile.j2 | 18 | ||||
| -rw-r--r-- | docker/tacker/tacker-server/Dockerfile.j2 | 18 |
3 files changed, 0 insertions, 57 deletions
diff --git a/docker/tacker/tacker-base/Dockerfile.j2 b/docker/tacker/tacker-base/Dockerfile.j2 index 4f6733328..b728b16da 100644 --- a/docker/tacker/tacker-base/Dockerfile.j2 +++ b/docker/tacker/tacker-base/Dockerfile.j2 @@ -10,25 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.enable_extra_repos(['openvswitch']) }} {{ macros.configure_user(name='tacker') }} -{% if install_type == 'binary' %} - - {% if base_package_type == 'rpm' %} - {% set tacker_base_packages = [ - 'openstack-tacker-common', - 'python3-networking-sfc' - ] %} - - {% elif base_package_type == 'deb' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} - -{{ macros.install_packages(tacker_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - ADD tacker-base-archive /tacker-base-source ADD plugins-archive / @@ -49,8 +30,6 @@ RUN ln -s tacker-base-source/* tacker \ {{ macros.install_pip(tacker_base_plugins_pip_packages) }}; \ fi -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_tacker_extend_start \ diff --git a/docker/tacker/tacker-conductor/Dockerfile.j2 b/docker/tacker/tacker-conductor/Dockerfile.j2 index f540cc5d6..48e3cd38c 100644 --- a/docker/tacker/tacker-conductor/Dockerfile.j2 +++ b/docker/tacker/tacker-conductor/Dockerfile.j2 @@ -7,24 +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 tacker_conductor_packages = [ - 'openstack-tacker' - ] %} - - {% elif base_package_type == 'deb' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} - -{{ macros.install_packages(tacker_conductor_packages | customizable("packages")) }} - -{% endif %} - {% block tacker_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/tacker/tacker-server/Dockerfile.j2 b/docker/tacker/tacker-server/Dockerfile.j2 index dd8460ce5..3e13a02e8 100644 --- a/docker/tacker/tacker-server/Dockerfile.j2 +++ b/docker/tacker/tacker-server/Dockerfile.j2 @@ -7,24 +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 tacker_server_packages = [ - 'openstack-tacker' - ] %} - - {% elif base_package_type == 'deb' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} - -{{ macros.install_packages(tacker_server_packages | customizable("packages")) }} - -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_tacker_extend_start RUN chmod 755 /usr/local/bin/kolla_tacker_extend_start |