Synchronise master with upstream

ansible/inventory/all-in-one

@@ -175,10 +175,10 @@ common
 [fluentd:children]
 common
 
-[kolla-logs:children]
+[kolla-toolbox:children]
 common
 
-[kolla-toolbox:children]
+[kolla_logs:children]
 common
 
 [opensearch:children]

ansible/inventory/multinode

@@ -193,12 +193,16 @@ common
 [fluentd:children]
 common
 
-[kolla-logs:children]
-common
-
 [kolla-toolbox:children]
 common
 
+[kolla_logs:children]
+control
+network
+compute
+storage
+monitoring
+
 [opensearch:children]
 control
 

ansible/roles/aodh/defaults/main.yml

@@ -17,7 +17,8 @@ aodh_services:
         port: "{{ aodh_api_port }}"
         listen_port: "{{ aodh_api_listen_port }}"
         backend_http_extra:
-          - "option httpchk"
+          - "option httpchk GET /healthcheck"
+          - "http-check expect status 200"
       aodh_api_external:
         enabled: "{{ enable_aodh }}"
         mode: "http"
@@ -26,7 +27,8 @@ aodh_services:
         port: "{{ aodh_api_public_port }}"
         listen_port: "{{ aodh_api_listen_port }}"
         backend_http_extra:
-          - "option httpchk"
+          - "option httpchk GET /healthcheck"
+          - "http-check expect status 200"
   aodh-evaluator:
     container_name: aodh_evaluator
     group: aodh-evaluator
@@ -131,7 +133,11 @@ aodh_api_enable_healthchecks: "{{ enable_container_healthchecks }}"
 aodh_api_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
 aodh_api_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
 aodh_api_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
-aodh_api_healthcheck_test: ["CMD-SHELL", "healthcheck_curl http://{{ api_interface_address | put_address_in_context('url') }}:{{ aodh_api_listen_port }}"]
+aodh_api_healthcheck_test:
+  - "CMD-SHELL"
+  - >-
+    healthcheck_curl http://{{
+    api_interface_address | put_address_in_context('url') }}:{{ aodh_api_listen_port }}/healthcheck
 aodh_api_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
 aodh_api_healthcheck:
   interval: "{{ aodh_api_healthcheck_interval }}"

ansible/roles/barbican/defaults/main.yml

@@ -18,7 +18,8 @@ barbican_services:
         listen_port: "{{ barbican_api_listen_port }}"
         tls_backend: "{{ barbican_enable_tls_backend }}"
         backend_http_extra:
-          - "option httpchk"
+          - "option httpchk GET /healthcheck"
+          - "http-check expect status 200"
       barbican_api_external:
         enabled: "{{ enable_barbican }}"
         mode: "http"
@@ -28,7 +29,8 @@ barbican_services:
         listen_port: "{{ barbican_api_listen_port }}"
         tls_backend: "{{ barbican_enable_tls_backend }}"
         backend_http_extra:
-          - "option httpchk"
+          - "option httpchk GET /healthcheck"
+          - "http-check expect status 200"
   barbican-keystone-listener:
     container_name: barbican_keystone_listener
     group: barbican-keystone-listener
@@ -107,7 +109,7 @@ barbican_api_healthcheck_test:
   - >-
     healthcheck_curl {{
     'https' if barbican_enable_tls_backend | bool else 'http' }}://{{
-    api_interface_address | put_address_in_context('url') }}:{{ barbican_api_listen_port }}
+    api_interface_address | put_address_in_context('url') }}:{{ barbican_api_listen_port }}/healthcheck"
 barbican_api_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
 barbican_api_healthcheck:
   interval: "{{ barbican_api_healthcheck_interval }}"

ansible/roles/cinder/defaults/main.yml

@@ -18,7 +18,8 @@ cinder_services:
         listen_port: "{{ cinder_api_listen_port }}"
         tls_backend: "{{ cinder_enable_tls_backend }}"
         backend_http_extra:
-          - "option httpchk"
+          - "option httpchk GET /healthcheck"
+          - "http-check expect status 200"
       cinder_api_external:
         enabled: "{{ enable_cinder }}"
         mode: "http"
@@ -28,7 +29,8 @@ cinder_services:
         listen_port: "{{ cinder_api_listen_port }}"
         tls_backend: "{{ cinder_enable_tls_backend }}"
         backend_http_extra:
-          - "option httpchk"
+          - "option httpchk GET /healthcheck"
+          - "http-check expect status 200"
   cinder-scheduler:
     container_name: cinder_scheduler
     group: cinder-scheduler
@@ -125,7 +127,7 @@ cinder_api_healthcheck_test:
   - >-
     healthcheck_curl {{
     'https' if cinder_enable_tls_backend | bool else 'http' }}://{{
-    api_interface_address | put_address_in_context('url') }}:{{ cinder_api_listen_port }}
+    api_interface_address | put_address_in_context('url') }}:{{ cinder_api_listen_port }}/healthcheck
 cinder_api_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
 cinder_api_healthcheck:
   interval: "{{ cinder_api_healthcheck_interval }}"
@@ -357,13 +359,6 @@ cinder_ks_services:
     endpoints:
       - {'interface': 'internal', 'url': '{{ cinder_internal_endpoint }}'}
       - {'interface': 'public', 'url': '{{ cinder_public_endpoint }}'}
-  # TODO(mattcrees): switch to absent in G-cycle, remove in H
-  - name: "cinderv3"
-    type: "volumev3"
-    description: "Openstack Block Storage (deprecated)"
-    endpoints:
-      - {'interface': 'internal', 'url': '{{ cinder_v3_internal_endpoint }}'}
-      - {'interface': 'public', 'url': '{{ cinder_v3_public_endpoint }}'}
 
 cinder_ks_users:
   - project: "service"

ansible/roles/cinder/tasks/upgrade.yml

@@ -20,6 +20,20 @@
 - name: Reload cinder services
   ansible.builtin.import_tasks: reload.yml
 
+# TODO(mnasiadka): Remove me in 2026.2
+- name: Remove cinderv3 catalog entries
+  vars:
+    _cinder_volumev3:
+      - name: "cinderv3"
+        type: "volumev3"
+        description: "Openstack Block Storage (deprecated)"
+        endpoints: []
+        state: absent
+    service_ks_register_auth: "{{ openstack_cinder_auth }}"
+    service_ks_register_services: "{{ _cinder_volumev3 }}"
+  ansible.builtin.import_role:
+    name: service-ks-register
+
 - name: Running Cinder online schema migration
   vars:
     cinder_api: "{{ cinder_services['cinder-api'] }}"

ansible/roles/cloudkitty/defaults/main.yml

@@ -17,7 +17,8 @@ cloudkitty_services:
         port: "{{ cloudkitty_api_port }}"
         listen_port: "{{ cloudkitty_api_listen_port }}"
         backend_http_extra:
-          - "option httpchk"
+          - "option httpchk GET /healthcheck"
+          - "http-check expect status 200"
       cloudkitty_api_external:
         enabled: "{{ enable_cloudkitty }}"
         mode: "http"
@@ -26,7 +27,8 @@ cloudkitty_services:
         port: "{{ cloudkitty_api_public_port }}"
         listen_port: "{{ cloudkitty_api_listen_port }}"
         backend_http_extra:
-          - "option httpchk"
+          - "option httpchk GET /healthcheck"
+          - "http-check expect status 200"
   cloudkitty-processor:
     container_name: "cloudkitty_processor"
     group: "cloudkitty-processor"
@@ -100,7 +102,11 @@ cloudkitty_api_enable_healthchecks: "{{ enable_container_healthchecks }}"
 cloudkitty_api_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
 cloudkitty_api_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
 cloudkitty_api_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
-cloudkitty_api_healthcheck_test: ["CMD-SHELL", "healthcheck_curl http://{{ api_interface_address | put_address_in_context('url') }}:{{ cloudkitty_api_port }}"]
+cloudkitty_api_healthcheck_test:
+  - "CMD-SHELL"
+  - >-
+    healthcheck_curl http://{{
+    api_interface_address | put_address_in_context('url') }}:{{ cloudkitty_api_port }}/healthcheck
 cloudkitty_api_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
 cloudkitty_api_healthcheck:
   interval: "{{ cloudkitty_api_healthcheck_interval }}"

ansible/roles/common/tasks/bootstrap.yml

@@ -1,16 +1 @@
 ---
-- name: Creating log volume
-  become: true
-  kolla_container:
-    action: "create_volume"
-    common_options: "{{ docker_common_options }}"
-    name: "kolla_logs"
-  when: inventory_hostname in groups['kolla-logs']
-
-- name: Link kolla_logs volume to /var/log/kolla
-  become: true
-  ansible.builtin.file:
-    src: "{{ container_engine_volumes_path }}/kolla_logs/_data"
-    path: /var/log/kolla
-    state: link
-  when: inventory_hostname in groups['kolla-logs']

ansible/roles/cron/templates/cron-logrotate-default.conf.j2

@@ -0,0 +1,3 @@
+"/var/log/kolla/{{ service }}/*.log"
+{
+}

ansible/roles/cron/templates/cron-logrotate-global.conf.j2

@@ -19,6 +19,6 @@ maxsize {{ cron_logrotate_log_maxsize }}
 su root kolla
 
 {% for service in cron_logrotate_enabled_services %}
-{%     include "cron-logrotate-" ~ service ~ ".conf.j2" %}
+{%     include ["cron-logrotate-" ~ service ~ ".conf.j2", "cron-logrotate-default.conf.j2"] %}
 
 {% endfor %}