cherry-pick: common: Stop using transitional labels to fix config-diff

ansible/roles/common/tasks/config.yml

@@ -39,57 +39,6 @@
   command: systemd-tmpfiles --create
   when: kolla_container_engine == 'podman'
 
-- name: Ensure fluentd image is present for label check
-  vars:
-    service_name: "fluentd"
-    service: "{{ common_services[service_name] }}"
-  become: true
-  kolla_container:
-    action: "ensure_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ service.image }}"
-  when: enable_fluentd | bool
-
-- name: Fetch fluentd Docker image labels
-  vars:
-    service_name: "fluentd"
-    service: "{{ common_services[service_name] }}"
-  become: true
-  docker_image_info:
-    name: "{{ service.image }}"
-  register: fluentd_labels_docker
-  when:
-    - kolla_container_engine == "docker"
-    - enable_fluentd | bool
-
-- name: Set fluentd facts
-  set_fact:
-    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
-
-- name: Fetch fluentd Podman image labels
-  vars:
-    service_name: "fluentd"
-    service: "{{ common_services[service_name] }}"
-  become: true
-  podman_image_info:
-    name: "{{ service.image }}"
-  register: fluentd_labels_podman
-  when:
-    - kolla_container_engine == "podman"
-    - enable_fluentd | bool
-
-- name: Set fluentd facts
-  set_fact:
-    fluentd_cmd: "{{ fluentd_labels_podman.images[0].Config.Labels.fluentd_binary | default('td-agent') }}"
-    fluentd_user: "{{ fluentd_labels_podman.images[0].Config.Labels.fluentd_user | default('td-agent') }}"
-  when:
-    - kolla_container_engine == "podman"
-    - enable_fluentd | bool
-
 - name: Copying over config.json files for services
   template:
     src: "{{ item.key }}.json.j2"
@@ -137,7 +86,7 @@
   delegate_to: localhost
   when: common_services.fluentd.enabled | bool
 
-- name: Copying over td-agent.conf
+- name: Copying over fluentd.conf
   vars:
     log_direct_to_elasticsearch: "{{ elasticsearch_address is defined }}"
     log_direct_to_opensearch: >-
@@ -195,8 +144,8 @@
         enabled: "{{ log_direct_to_opensearch }}"
     customised_output_files: "{{ find_custom_fluentd_outputs.files | map(attribute='path') | list }}"
   template:
-    src: "td-agent.conf.j2"
-    dest: "{{ node_config_directory }}/fluentd/td-agent.conf"
+    src: "fluentd.conf.j2"
+    dest: "{{ node_config_directory }}/fluentd/fluentd.conf"
     mode: "0660"
   become: true
   when:

ansible/roles/common/templates/conf/input/00-global.conf.j2

@@ -9,7 +9,7 @@
                 "/var/log/kolla/*/*-error.log",
                 "/var/log/kolla/*/*_access.log",
                 "/var/log/kolla/*/*_error.log"]
-  pos_file /var/run/{{ fluentd_user }}/kolla-openstack.pos
+  pos_file /var/run/fluentd/kolla-openstack.pos
   tag kolla.*
   ignore_repeated_permission_error true
   enable_watch_timer false

ansible/roles/common/templates/conf/input/02-mariadb.conf.j2

@@ -3,7 +3,7 @@
 <source>
   @type tail
   path /var/log/kolla/mariadb/mariadb.log
-  pos_file /var/run/{{ fluentd_user }}/mariadb.pos
+  pos_file /var/run/fluentd/mariadb.pos
   tag infra.mariadb
   enable_watch_timer false
   <parse>
@@ -15,7 +15,7 @@
 <source>
   @type tail
   path /var/log/kolla/mariadb/xinetd.log
-  pos_file /var/run/{{ fluentd_user }}/mariadb-xinetd.pos
+  pos_file /var/run/fluentd/mariadb-xinetd.pos
   tag infra.mariadb-xinetd
   ignore_repeated_permission_error true
   enable_watch_timer false

ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2

@@ -1,7 +1,7 @@
 <source>
   @type tail
   path /var/log/kolla/rabbitmq/rabbit@{{ ansible_facts.hostname }}.log
-  pos_file /var/run/{{ fluentd_user }}/rabbit.pos
+  pos_file /var/run/fluentd/rabbit.pos
   tag infra.rabbit
   enable_watch_timer false
   <parse>

ansible/roles/common/templates/conf/input/04-openstack-wsgi.conf.j2

@@ -2,7 +2,7 @@
 <source>
   @type tail
   path /var/log/kolla/*/*-access.log,/var/log/kolla/*/*-error.log,/var/log/kolla/*/*_access.log,/var/log/kolla/*/*_error.log
-  pos_file /var/run/{{ fluentd_user }}/kolla-openstack-wsgi.pos
+  pos_file /var/run/fluentd/kolla-openstack-wsgi.pos
   tag kolla.*
   enable_watch_timer false
   <parse>

ansible/roles/common/templates/conf/input/05-libvirt.conf.j2

@@ -1,7 +1,7 @@
 <source>
   @type tail
   path /var/log/kolla/libvirt/libvirtd.log
-  pos_file /var/run/{{ fluentd_user }}/libvirt.pos
+  pos_file /var/run/fluentd/libvirt.pos
   tag infra.libvirt
   enable_watch_timer false
   <parse>

ansible/roles/common/templates/conf/input/10-openvswitch.conf.j2

@@ -1,7 +1,7 @@
 <source>
   @type tail
   path /var/log/kolla/openvswitch/ovs-vswitchd.log
-  pos_file /var/run/{{ fluentd_user }}/openvswitch.pos
+  pos_file /var/run/fluentd/openvswitch.pos
   tag infra.openvswitch
   enable_watch_timer false
   <parse>
@@ -16,7 +16,7 @@
 <source>
   @type tail
   path /var/log/kolla/openvswitch/ovsdb-server.log
-  pos_file /var/run/{{ fluentd_user }}/openvswitchdb.pos
+  pos_file /var/run/fluentd/openvswitchdb.pos
   tag infra.openvswitchdb
   enable_watch_timer false
   <parse>

ansible/roles/common/templates/conf/input/11-letsencrypt.conf.j2

@@ -2,7 +2,7 @@
   @type tail
   @log_level debug
   path /var/log/kolla/letsencrypt/letsencrypt-lego.log
-  pos_file /var/run/{{ fluentd_user }}/letsencrypt.pos
+  pos_file /var/run/fluentd/letsencrypt.pos
   tag infra.letsencrypt.lego
   enable_watch_timer false
   <parse>

ansible/roles/common/templates/fluentd.json.j2

@@ -1,39 +1,36 @@
-{% set fluentd_dir = '/etc/' + (fluentd_cmd | default('td-agent')) %}
-{% set fluentd_conf = (fluentd_cmd | default('td-agent')) + '.conf' %}
-
 {
-    "command": "{{ fluentd_cmd }} -c {{ fluentd_dir }}/{{ fluentd_conf }} -o /var/log/kolla/fluentd/fluentd.log",
+    "command": "fluentd -c /etc/fluentd/fluentd.conf -o /var/log/kolla/fluentd/fluentd.log",
     "config_files": [
         {
-            "source": "{{ container_config_directory }}/td-agent.conf",
-            "dest": "{{ fluentd_dir }}/{{ fluentd_conf }}",
-            "owner": "{{ fluentd_user }}",
+            "source": "{{ container_config_directory }}/fluentd.conf",
+            "dest": "/etc/fluentd/fluentd.conf",
+            "owner": "fluentd",
             "perm": "0600"
         }
     ],
     "permissions": [
         {
             "path": "/var/log/kolla/fluentd",
-            "owner": "{{ fluentd_user }}:{{ fluentd_user }}",
+            "owner": "fluentd:fluentd",
             "recurse": true
         },
 {% for facility in syslog_facilities | selectattr('enabled') %}
         {
             "path": "/var/log/kolla/{{ facility.logdir }}",
-            "owner": "{{ fluentd_user }}:{{ fluentd_user }}",
+            "owner": "fluentd:fluentd",
             "recurse": true
         },
 {% endfor %}
 {% if enable_fluentd_systemd | bool %}
         {
             "path": "/var/log/journal",
-            "owner": "{{ fluentd_user }}:{{ fluentd_user }}",
+            "owner": "fluentd:fluentd",
             "recurse": true
         },
 {% endif %}
         {
             "path": "/var/lib/fluentd/data",
-            "owner": "{{ fluentd_user }}:{{ fluentd_user }}",
+            "owner": "fluentd:fluentd",
             "recurse": true
         }
     ]