Merge https://github.com/openstack/ironic:master (eda12b9) into main#391
Merge https://github.com/openstack/ironic:master (eda12b9) into main#391ironic-merge-bot[bot] wants to merge 23 commits intoopenshift:mainfrom
Conversation
A follow-up to 956500 (periodic cleanup of stale conductors - offline for longer than a configured timeout period.) New review feedback identified that the original patch never NULLs `conductor_affinity`, so deleting a conductor will fail with an FK constraint violation. Unit tests were added by AI. Assisted-by: Claude Opus 4.6 Change-Id: Ie557c6ec0f96d013d182f9c85e8f41cac4cbd8af Signed-off-by: Afonne-CID <afonnepaulc@gmail.com>
In general we should not upgrade the base image when building a container as the base image is already rebuilt regularly. Also setting the base image explicitely to one recommended by ART.
Adds the parent node support and tests in one change including all DB/Model/API changes along with RBAC and basic API tests. * Updates the API version to 1.83 * Adds parent_node and related index to the nodes table. * Adds new API parameters to list by parent node relationship. Depends-On: https://review.opendev.org/c/openstack/ironic/+/883967 Change-Id: I8d64fee7105718199986db4994e13352d639f04f
Change-Id: I22c8aae89d24d3ff330f10f1e0d43461fd6e52d4
We need to pin libraries that are still compatible with python 3.9 as upstream has already dropped compatibility.
(cherry picked from commit aa7dfab)
Back when we developed service, we expected operators to iterate to fix their issues, but we also put in abort code. We just never wired in the abort code to the abort verb. It really seems like we really should have done that, and this change changes API and Conductor code path to make this happen. Closes-Bug: 2119989 Assisted-By: Claude Clode - Claude Sonnet 4 Change-Id: Ic02ba87485a676e77563057427ab94953bea2cc2 Signed-off-by: Julia Kreger <juliaashleykreger@gmail.com> (cherry picked from commit 1eda807)
Currently, Ironic codebase allows aborting servicing state regardless of whether a servicing step has abortable flag set or not. This patch fixes this by adding handling of service wait states to abort code paths and adding the missing state machine transition. Generated-By: Claude Code Sonnet 3.5 Change-Id: Ie07490bdb9c6461bd6ac7a6315773dcfb13592f9 Signed-off-by: Jacob Anders <janders@redhat.com> (cherry picked from commit fa8a8fb)
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: ironic-merge-bot[bot] The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
@ironic-merge-bot[bot]: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
No description provided.