Merge pull request #657 from stackhpc/upstream/2024.1-2025-01-03

Synchronise 2024.1 with upstream

ansible/post-deploy.yml

@@ -50,6 +50,15 @@
         group: "{{ ansible_facts.user_gid }}"
         mode: 0600
 
+    - name: Template out public-openrc-system.sh
+      become: true
+      template:
+        src: "roles/common/templates/public-openrc-system.sh.j2"
+        dest: "{{ node_config }}/public-openrc-system.sh"
+        owner: "{{ ansible_facts.user_uid }}"
+        group: "{{ ansible_facts.user_gid }}"
+        mode: 0600
+
     - import_role:
         name: octavia
         tasks_from: openrc.yml

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

@@ -16,7 +16,7 @@
   <parse>
     @type multiline
     format_firstline /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3} \d+ \S+ \S+ \[.*\]/
-    format1 /^(?<Timestamp>\S+ \S+) (?<Pid>\d+) (?<log_level>\S+) (?<python_module>\S+) \[(\S+ req-)?((?<request_id>\S+) (?<user_id>\S+) (?<tenant_id>\S+) (?<domain_id>\S+) (?<system_scope>\S+) (?<user_domain>\S+) (?<project_domain>\S+)|-)\] (?<Payload>.*)?$/
+    format1 /^(?<Timestamp>\S+ \S+) (?<Pid>\d+) (?<log_level>\S+) (?<python_module>\S+) ((?:\[)(?:None|req-)(?<global_request_id>\S+)? (?:None|req-)(?<request_id>\S+) (?<user_id>\S+) (?<tenant_id>\S+) (?<domain_id>\S+) (?<system_scope>\S+) (?<user_domain>\S+) (?<project_domain>\S+)(?:\]))?(?<Payload>.*)?$/
     time_key Timestamp
     keep_time_key true
     time_format %F %T.%L

ansible/roles/common/templates/public-openrc-system.sh.j2

@@ -0,0 +1,15 @@
+# {{ ansible_managed }}
+
+# Clear any old environment that may conflict.
+for key in $( set | awk '{FS="="}  /^OS_/ {print $1}' ); do unset $key ; done
+export OS_USER_DOMAIN_NAME=Default
+export OS_SYSTEM_SCOPE=all
+export OS_USERNAME={{ keystone_admin_user }}
+export OS_PASSWORD={{ keystone_admin_password }}
+export OS_AUTH_URL={{ keystone_public_url }}
+export OS_IDENTITY_API_VERSION=3
+export OS_REGION_NAME={{ openstack_region_name }}
+export OS_AUTH_PLUGIN=password
+{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %}
+export OS_CACERT={{ kolla_admin_openrc_cacert }}
+{% endif %}

ansible/roles/nova-cell/defaults/main.yml

@@ -380,7 +380,6 @@ nova_libvirt_default_volumes:
   - "{{ nova_instance_datadir_volume }}:/var/lib/nova/"
   - "{% if enable_shared_var_lib_nova_mnt | bool %}/var/lib/nova/mnt:/var/lib/nova/mnt:shared{% endif %}"
   - "nova_libvirt_qemu:/etc/libvirt/qemu"
-  - "nova_libvirt_secrets:/etc/libvirt/secrets"
   - "{{ kolla_dev_repos_directory ~ '/nova/nova:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/nova' if nova_dev_mode | bool else '' }}"
 nova_ssh_default_volumes:
   - "{{ node_config_directory }}/nova-ssh/:{{ container_config_directory }}/:ro"

ansible/roles/nova-cell/tasks/deploy.yml

@@ -35,3 +35,5 @@
     # and there is a cell conductor in the inventory to delegate to.
     - all_computes_in_batch | length > 0
     - groups[nova_cell_conductor_group] | length > 0
+
+- import_tasks: post-config.yml

ansible/roles/nova-cell/tasks/post-config.yml

@@ -0,0 +1,8 @@
+---
+# TODO(kevko) Remove in E cycle
+- name: Remove old nova_libvirt_secrets container volume
+  become: true
+  kolla_container:
+    container_engine: "{{ kolla_container_engine }}"
+    action: "remove_volume"
+    name: nova_libvirt_secrets

ansible/roles/nova-cell/tasks/rolling_upgrade.yml

@@ -14,3 +14,5 @@
 
 - name: Flush handlers
   meta: flush_handlers
+
+- import_tasks: post-config.yml

releasenotes/notes/bug-2044370-2285fc3952981cae.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes cases when fluentd parser fails on Python traceback.
+    OpenStack services regex has been reworked to include both
+    global_request_id and handling cases with Python traceback.
+    `LP#2044370 <https://launchpad.net/bugs/2044370>`_

releasenotes/notes/bug-2073678-45f31547395ef3c7.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes busy libvirt's secret volume while secrets are changing.
+    `LP#2073678 <https://launchpad.net/bugs/2073678>`__

releasenotes/notes/public-openrc-system-e52c9f5440b6f594.yaml

@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Generates a system-scoped ``public-openrc-system.sh`` file. This allows
+    running Ironic commands against the public API, which is useful when access
+    to the internal API is unavailable.
+    `LP#2051837 <https://launchpad.net/bugs/2051837>`__