Merge pull request #499 from stackhpc/upstream/yoga-2023-12-04

Synchronise yoga with upstream

ansible/roles/common/defaults/main.yml

@@ -156,8 +156,6 @@ fluentd_input_openstack_services:
     enabled: "{{ enable_freezer | bool }}"
   - name: glance
     enabled: "{{ enable_glance | bool }}"
-  - name: glance-tls-proxy
-    enabled: "{{ enable_glance | bool }}"
   - name: gnocchi
     enabled: "{{ enable_gnocchi | bool }}"
   - name: heat
@@ -186,8 +184,6 @@ fluentd_input_openstack_services:
     enabled: "{{ enable_murano | bool }}"
   - name: neutron
     enabled: "{{ enable_neutron | bool }}"
-  - name: neutron-tls-proxy
-    enabled: "{{ neutron_enable_tls_backend | bool }}"
   - name: nova
     enabled: "{{ enable_nova | bool }}"
   - name: octavia

ansible/roles/horizon/templates/horizon.conf.j2

@@ -15,7 +15,8 @@ TraceEnable off
 
 <VirtualHost {{ api_interface_address }}:{{ horizon_listen_port }}>
     LogLevel warn
-    ErrorLog /var/log/kolla/horizon/horizon.log
+    ErrorLogFormat "%{cu}t %M"
+    ErrorLog /var/log/kolla/horizon/horizon-error.log
     LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
     CustomLog /var/log/kolla/horizon/horizon-access.log logformat
 

ansible/roles/rabbitmq/tasks/reset-state.yml

@@ -1,16 +1,16 @@
 ---
 - name: Stop the RabbitMQ application
   become: true
-  command: "{{ kolla_container_engine }} exec rabbitmq rabbitmqctl stop_app"
+  command: "docker exec rabbitmq rabbitmqctl stop_app"
 
 - name: Reset the state of RabbitMQ
   become: true
-  command: "{{ kolla_container_engine }} exec rabbitmq rabbitmqctl force_reset"
+  command: "docker exec rabbitmq rabbitmqctl force_reset"
 
 - name: Start the RabbitMQ application
   become: true
-  command: "{{ kolla_container_engine }} exec rabbitmq rabbitmqctl start_app"
+  command: "docker exec rabbitmq rabbitmqctl start_app"
 
 - name: Wait for all RabbitMQ nodes to join the cluster
   become: true
-  command: "{{ kolla_container_engine }} exec rabbitmq rabbitmqctl await_online_nodes {{ groups['rabbitmq'] | length }}"
+  command: "docker exec rabbitmq rabbitmqctl await_online_nodes {{ groups['rabbitmq'] | length }}"

releasenotes/notes/horizon-log-bugfix-b89f502c2f3ccaf9.yaml

@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Fixes an issue where Fluentd was parsing Horizon WSGI application logs
+    incorrectly.
+    Horizon error logs are now written to ``horizon-error.log`` instead of
+    ``horizon.log``.
+    See `LP#1898174 <https://bugs.launchpad.net/kolla-ansible/+bug/1898174>`__