Merge pull request #871 from stackhpc/upstream/2025.1-2026-05-11

Synchronise 2025.1 with upstream

Author: Alex-Welsh

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

@@ -203,3 +203,23 @@
   with_items:
     - nova-compute
     - nova-compute-ironic
+
+- name: Copying over multipath.conf
+  become: true
+  vars:
+    service: "{{ nova_cell_services['nova-compute'] }}"
+  ansible.builtin.template:
+    src: "{{ item }}"
+    dest: "{{ node_config_directory }}/nova-compute/multipath.conf"
+    mode: "0660"
+  with_first_found:
+    - files:
+        - "{{ node_custom_config }}/nova/{{ inventory_hostname }}/multipath.conf"
+        - "{{ node_custom_config }}/multipath/{{ inventory_hostname }}/multipath.conf"
+        - "{{ node_custom_config }}/nova/multipath.conf"
+        - "{{ node_custom_config }}/multipath.conf"
+        - "multipath.conf.j2"
+      skip: true
+  when:
+    - service | service_enabled_and_mapped_to_host
+    - enable_multipathd | bool

ansible/roles/nova-cell/templates/multipath.conf.j2

@@ -0,0 +1,8 @@
+defaults {
+   user_friendly_names no
+   find_multipaths yes
+   skip_kpartx yes
+}
+
+blacklist {
+}

ansible/roles/nova-cell/templates/nova-compute.json.j2

@@ -85,6 +85,12 @@
             "dest": "/var/lib/kolla/share/ca-certificates",
             "owner": "root",
             "perm": "0600"
+        }{% endif %}{% if enable_multipathd | bool %},
+        {
+            "source": "{{ container_config_directory }}/multipath.conf",
+            "dest": "/etc/multipath.conf",
+            "owner": "root",
+            "perm": "0644"
         }{% endif %}
     ],
     "permissions": [