From 81c2d0725e313a149fcc3a847dae4c89d68592c9 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 23 Jan 2025 15:47:38 +0100
Subject: [PATCH] fluentd: Add placement to list of supported services

Closes-Bug: #2095607
Change-Id: Ie1372ce307011c6f2560c7f1fcd520187810fab8
(cherry picked from commit fec66c1334fe798d073954002a668662065be277)
(cherry picked from commit 1845fb8100cc3f3031cfe238c091ecbb2224026f)
---
 ansible/roles/common/defaults/main.yml                     | 2 ++
 .../roles/placement/templates/placement-api-wsgi.conf.j2   | 2 +-
 releasenotes/notes/bug-2095607-f4d9d5aebebddfc8.yaml       | 7 +++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/bug-2095607-f4d9d5aebebddfc8.yaml

diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml
index 9fae431b15..25376fefcc 100644
--- a/ansible/roles/common/defaults/main.yml
+++ b/ansible/roles/common/defaults/main.yml
@@ -186,6 +186,8 @@ fluentd_input_openstack_services:
     enabled: "{{ enable_nova | bool }}"
   - name: octavia
     enabled: "{{ enable_octavia | bool }}"
+  - name: placement
+    enabled: "{{ enable_placement | bool }}"
   - name: tacker
     enabled: "{{ enable_tacker | bool }}"
   - name: trove
diff --git a/ansible/roles/placement/templates/placement-api-wsgi.conf.j2 b/ansible/roles/placement/templates/placement-api-wsgi.conf.j2
index 2f2a9dc913..aa313b6809 100644
--- a/ansible/roles/placement/templates/placement-api-wsgi.conf.j2
+++ b/ansible/roles/placement/templates/placement-api-wsgi.conf.j2
@@ -28,7 +28,7 @@ LogLevel info
     <IfVersion >= 2.4>
       ErrorLogFormat "%{cu}t %M"
     </IfVersion>
-    ErrorLog "{{ log_dir }}/placement-api.log"
+    ErrorLog "{{ log_dir }}/placement-api-error.log"
     LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
     CustomLog "{{ log_dir }}/placement-api-access.log" logformat
     <Directory {{ wsgi_directory }}>
diff --git a/releasenotes/notes/bug-2095607-f4d9d5aebebddfc8.yaml b/releasenotes/notes/bug-2095607-f4d9d5aebebddfc8.yaml
new file mode 100644
index 0000000000..dfa17a9e9a
--- /dev/null
+++ b/releasenotes/notes/bug-2095607-f4d9d5aebebddfc8.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes Apache and placement writing to the same log file.
+    Apache placement VirtualHost ErrorLog has been renamed to
+    ``placement-api-error.log`` (similar to other services).
+    `LP#[2095607] <https://launchpad.net/bugs/2095607>`__