From 33ab87aad71face19719406e462ea7527e6a59ef Mon Sep 17 00:00:00 2001 From: Grzegorz Bialas Date: Fri, 23 Aug 2024 15:36:14 +0200 Subject: [PATCH 1/2] Fix links in docs for unmaintained releases Links in docs for unmaintained branches (Yoga and Zed) are still pointing to stable/ branches in repository. Instead they should point to unmaintained/. This patch aims to fix that. Closes-Bug: #2066052 Change-Id: I7e30ee5754ca2ecf9d4a2d3519f9e0bdf3f0aeea (cherry picked from commit c0ce3802ab30c2ffc00f34c7a630623821cba83b) --- doc/source/conf.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index dc5627d89b..a4841864ff 100644 --- a/doc/source/conf.py +++ b/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 =\ From c2fbc36c204d24bd29645b36c73d9849feb48398 Mon Sep 17 00:00:00 2001 From: Victor Chembaev Date: Wed, 4 Sep 2024 22:11:27 +0300 Subject: [PATCH 2/2] Fix os-brick multipathd del map fails for SAN multipath devices Change-Id: Ie73d7eef294e9e579314a61b39382f3ff3ba4b4b Closes-Bug: 2078973 (cherry picked from commit 3b824a0a12ff51fdfaac17893bb1e591307c904d) --- ansible/roles/multipathd/templates/multipath.conf.j2 | 1 + .../fix-multipathd-kpartx-disable-44732c1378ae2291.yaml | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 releasenotes/notes/fix-multipathd-kpartx-disable-44732c1378ae2291.yaml diff --git a/ansible/roles/multipathd/templates/multipath.conf.j2 b/ansible/roles/multipathd/templates/multipath.conf.j2 index 5aa10573e7..478eef0230 100644 --- a/ansible/roles/multipathd/templates/multipath.conf.j2 +++ b/ansible/roles/multipathd/templates/multipath.conf.j2 @@ -1,6 +1,7 @@ defaults { user_friendly_names no find_multipaths yes + skip_kpartx yes } blacklist { diff --git a/releasenotes/notes/fix-multipathd-kpartx-disable-44732c1378ae2291.yaml b/releasenotes/notes/fix-multipathd-kpartx-disable-44732c1378ae2291.yaml new file mode 100644 index 0000000000..3bcf8a84da --- /dev/null +++ b/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 `__`