openstack/kolla-ansible
Code Issues Proposed changes

common: Fix fluentd labels when using Docker 26

Browse Source 
Closes-Bug: #2058615

[1]: https://github.com/docker/cli/blob/v26.0.0/docs/deprecated.md#container-and-containerconfig-fields-in-image-inspect

Change-Id: I96ec812a482f017a48d978586c6f535fedd5fbe8
This commit is contained in:
Michal Nasiadka 2024-03-21 08:19:15 +01:00
parent 86873f4ccd
commit 8025341023
1 changed files with 2 additions and 2 deletions

4
ansible/roles/common/tasks/config.yml

@ -64,8 +64,8 @@
- name: Set fluentd facts
set_fact:
fluentd_cmd: "{{ fluentd_labels_docker.images[0].ContainerConfig.Labels.fluentd_binary | default('td-agent') }}"
fluentd_user: "{{ fluentd_labels_docker.images[0].ContainerConfig.Labels.fluentd_user | default('td-agent') }}"
fluentd_cmd: "{{ fluentd_labels_docker.images[0].Config.Labels.fluentd_binary | default(fluentd_labels_docker.images[0].ContainerConfig.Labels.fluentd_binary) | default('td-agent') }}"
fluentd_user: "{{ fluentd_labels_docker.images[0].Config.Labels.fluentd_user | default(fluentd_labels_docker.images[0].ContainerConfig.Labels.fluentd_user) | default('td-agent') }}"
when:
- kolla_container_engine == "docker"
- enable_fluentd | bool