diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2026-07-06 15:26:00 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-07-06 19:59:40 +0000 |
| commit | db35ac8d793506bc43b62e7e39d27a75de1043ed (patch) | |
| tree | feec28d13a43490f5fd4260374144a1abfc20331 /docker/tacker/tacker-base | |
| parent | 1ae1850557e3b99902f73b32c9005618537a1f2d (diff) | |
| download | kolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.tar.gz kolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.zip | |
Migrate to pyproject.toml
[tool.setuptools.data-files] does not support recursive directory
installation. The old setup.cfg [files] worked because PBR's
FilesConfig.expand_globs() used os.walk() to expand docker/*, but
this hook is not triggered by the pbr.build PEP-517 backend.
Move docker/ into kolla/ and use [tool.setuptools.package-data]
instead. Update kolla_worker._get_images_dir() to check the kolla
package directory first so both editable and regular installs work.
Change-Id: I4fc452c03740ef22ebbb4e8d0d86c4f4783e2d09
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'docker/tacker/tacker-base')
| -rw-r--r-- | docker/tacker/tacker-base/Dockerfile.j2 | 43 | ||||
| -rw-r--r-- | docker/tacker/tacker-base/extend_start.sh | 10 |
2 files changed, 0 insertions, 53 deletions
diff --git a/docker/tacker/tacker-base/Dockerfile.j2 b/docker/tacker/tacker-base/Dockerfile.j2 deleted file mode 100644 index c24c8d87c..000000000 --- a/docker/tacker/tacker-base/Dockerfile.j2 +++ /dev/null @@ -1,43 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block tacker_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='tacker') }} - -{% if base_package_type == 'rpm' %} - -{{ macros.enable_extra_repos(['openvswitch']) }} - -{% endif %} - -ADD tacker-base-archive /tacker-base-source -ADD plugins-archive / - -{% set tacker_base_pip_packages = [ - '/tacker' -] %} - -{% set tacker_base_plugins_pip_packages = [ - '/plugins/*' -] %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN ln -s tacker-base-source/* tacker \ - && {{ macros.install_pip(tacker_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/tacker \ - && cp -r /tacker/etc/tacker/* /etc/tacker \ - && if [ "$(ls /plugins)" ]; then \ - {{ macros.install_pip(tacker_base_plugins_pip_packages) }}; \ - fi \ - && touch /usr/local/bin/kolla_tacker_extend_start \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_tacker_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block tacker_base_footer %}{% endblock %} diff --git a/docker/tacker/tacker-base/extend_start.sh b/docker/tacker/tacker-base/extend_start.sh deleted file mode 100644 index a3b7db8d3..000000000 --- a/docker/tacker/tacker-base/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/tacker" ]]; then - mkdir -p /var/log/kolla/tacker -fi -if [[ $(stat -c %a /var/log/kolla/tacker) != "755" ]]; then - chmod 755 /var/log/kolla/tacker -fi - -. /usr/local/bin/kolla_tacker_extend_start |