Merge pull request #623 from stackhpc/upstream/2023.1-2024-09-30

Synchronise 2023.1 with upstream

ansible/roles/multipathd/templates/multipath.conf.j2

@@ -1,6 +1,7 @@
 defaults {
    user_friendly_names no
    find_multipaths yes
+   skip_kpartx yes
 }
 
 blacklist {

doc/source/conf.py

@@ -117,14 +117,26 @@
 
 # Global variables
 # For replacement, use in docs as |VAR_NAME| (note there's no space around variable name)
-# When adding new variables, make sure you add them to GLOBAL_VARIABLE_MAP dictionary as well
+# When adding new variables, that you want to use in documentation, make sure you add
+# them to GLOBAL_VARIABLE_MAP dictionary as well. KOLLA_OPENSTACK_RELEASE_UNMAINTAINED is
+# used only to denote unmaintained branches, and it is not intended to be used for
+# replacing anything in documentation.
 
 KOLLA_OPENSTACK_RELEASE = openstackdocstheme.ext._get_series_name()
 
+KOLLA_OPENSTACK_RELEASE_UNMAINTAINED = [
+    'yoga',
+    'zed',
+]
+
 if KOLLA_OPENSTACK_RELEASE == 'latest':
     KOLLA_OPENSTACK_RELEASE = 'master'
     KOLLA_BRANCH_NAME = 'master'
     TESTED_RUNTIMES_GOVERNANCE_URL = 'https://governance.openstack.org/tc/reference/runtimes/'
+elif KOLLA_OPENSTACK_RELEASE in KOLLA_OPENSTACK_RELEASE_UNMAINTAINED:
+    KOLLA_BRANCH_NAME = 'unmaintained/{}'.format(KOLLA_OPENSTACK_RELEASE)
+    TESTED_RUNTIMES_GOVERNANCE_URL =\
+        'https://governance.openstack.org/tc/reference/runtimes/{}.html'.format(KOLLA_OPENSTACK_RELEASE)
 else:
     KOLLA_BRANCH_NAME = 'stable/{}'.format(KOLLA_OPENSTACK_RELEASE)
     TESTED_RUNTIMES_GOVERNANCE_URL =\

releasenotes/notes/fix-multipathd-kpartx-disable-44732c1378ae2291.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Add ``skip_kpartx yes`` to multipath.conf ``defaults`` section to prevent
+    kpartx scanning multipath devices and unlock ``multipathd del map``
+    operation of os-brick for volume detaching oprtaions.
+    `LP#2078973 <https://launchpad.net/bugs/2078973>`__`