From 579bdb75e31fc5a53970a43d1f821f1f6f61743d Mon Sep 17 00:00:00 2001 From: Maksim Malchuk Date: Tue, 20 Jan 2026 12:48:23 +0300 Subject: [PATCH 1/3] Add the ability to override 'disable_boot_timeout' Some baremetal servers don't handle raw commands correctly, sent by default [1] when 'disable_boot_timeout' is set to true [2], so this change adds the ability to override this setting in the 'ironic.conf' file via the 'ipmi_disable_boot_timeout' variable. 1. https://opendev.org/openstack/ironic/src/branch/master/ironic/drivers/modules/ipmitool.py#L1230-L1246 2. https://opendev.org/openstack/ironic/src/branch/master/ironic/conf/ipmi.py#L57-L65 Closes-Bug: #2138712 Change-Id: I2f30ef92f590fa954cc2b067ff180f36c214cecb Signed-off-by: Maksim Malchuk (cherry picked from commit 35245e6f51737889165f21247691072df0729512) --- playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 index 43195258..aa38dcdc 100644 --- a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 +++ b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 @@ -142,6 +142,7 @@ allow_credentials = {{ enable_cors_credential_support | default('true') }} [ipmi] debug = {{ ironic_debug | bool and testing | bool }} +disable_boot_timeout = {{ ipmi_disable_boot_timeout | default('True') | bool }} [ilo] use_web_server_for_images = true From 5c7ced27caf22f00c91314f5afaf1857115f0e0b Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Tue, 27 Jan 2026 14:51:54 +0100 Subject: [PATCH 2/3] [stable only][2025.1] Ensure firewalld is unmasked before enabling it The service may be masked to avoid changing status as it may expect a firewall-free environment. Also install setuptools to fix tox-docs job. Change-Id: I1214832ef967418ec2f93faf6fa090a40ad12f7a Signed-off-by: Riccardo Pittau --- .../roles/bifrost-ironic-install/tasks/setup_firewalld.yml | 5 +++++ tox.ini | 1 + 2 files changed, 6 insertions(+) diff --git a/playbooks/roles/bifrost-ironic-install/tasks/setup_firewalld.yml b/playbooks/roles/bifrost-ironic-install/tasks/setup_firewalld.yml index 3c960eda..2bf1316f 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/setup_firewalld.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/setup_firewalld.yml @@ -11,6 +11,11 @@ # See the License for the specific language governing permissions and # limitations under the License. --- +- name: "Ensure firewalld is unmasked" + systemd: + name: firewalld + masked: no + - name: "Enable firewalld" service: name: firewalld diff --git a/tox.ini b/tox.ini index 6725788f..7a1a5a4c 100644 --- a/tox.ini +++ b/tox.ini @@ -42,6 +42,7 @@ commands = python setup.py test --coverage --testr-args='{posargs}' deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.1} -r{toxinidir}/doc/requirements.txt + setuptools>=65.7.0,<82 # MIT commands = sphinx-build -W -b html doc/source doc/build/html [testenv:pdf-docs] From 1333833ca6c0a13ae6a2369b7e37868da11e9923 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 17 Feb 2026 21:23:49 +0900 Subject: [PATCH 3/3] Remove unused sphinxcontrib-blockdiag This extension hasn't been updated for 4+ years and now can't be installed due to its dependency on pkg_resources . Change-Id: Ie2cedc9abacbeb8be5f9d2d11e610f0075faa4fd Signed-off-by: Takashi Kajinami (cherry picked from commit 96614f61528483ac07be6a015cf622256beee1f0) --- doc/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index b6ef42dc..255f9f24 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,6 +1,5 @@ sphinx>=2.0.0,!=2.1.0 # BSD sphinxcontrib-httpdomain>=1.3.0 # BSD -sphinxcontrib-blockdiag>=1.5.4 # BSD sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD reno>=3.1.0 # Apache-2.0 os-api-ref>=1.4.0 # Apache-2.0