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/fluentd/Dockerfile.j2 | |
| 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/fluentd/Dockerfile.j2')
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 deleted file mode 100644 index c63e1b990..000000000 --- a/docker/fluentd/Dockerfile.j2 +++ /dev/null @@ -1,62 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} - -{% set fluentd_user = 'fluentd' %} - -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" fluentd_binary="fluentd" fluentd_user="{{ fluentd_user }}" -{% endblock %} - -{% block fluentd_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.enable_extra_repos(['fluentd']) }} - -{% if base_package_type == 'rpm' %} - - {% set fluentd_packages = [ - 'gcc-c++', - 'make', - 'fluent-package', - ] %} - -{% elif base_package_type == 'deb' %} - - {% set fluentd_packages = [ - 'g++', - 'make', - 'fluent-package', - ] %} - -{% endif %} - -{{ macros.configure_user(name=fluentd_user, groups='mysql') }} - -COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -{{ macros.install_packages(fluentd_packages | customizable("packages")) }} \ - && chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \ - && mkdir -p /etc/{{ fluentd_user }} \ - && mkdir -p /var/run/{{ fluentd_user }} \ - && chown -R {{ fluentd_user }}: /var/run/{{ fluentd_user }} \ - && chmod 644 /usr/local/bin/kolla_extend_start - -{% block fluentd_plugins_install %} - -{% set fluentd_plugins = [ - 'fluent-plugin-grok-parser', - 'fluent-plugin-prometheus', - 'fluent-plugin-rewrite-tag-filter', -] %} - -{{ macros.install_fluent_plugins(fluentd_plugins | customizable("plugins")) }} - -{% endblock %} - -{{ macros.kolla_patch_sources() }} - -{% block fluentd_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER {{ fluentd_user }} |