Synchronise 2025.1 with upstream#567
Merged
Merged
Conversation
When ``ansible-galaxy collection install`` is called with two requirements files, only the latter one is registered and dependencies on the first requirements file are ignored. Fixing by performing two separate ansible-galaxy installation. One for core collections (Defined at file path ``kolla_ansible_core_requirements_yml``) and another for additional collections (Defined at file path ``kolla_ansible_requirements_yml``). Closes-Bug: #2153994 Change-Id: Ie179ac46c28c08f3ed41922485ef2e532a2d6e46 Signed-off-by: Seunghun Lee <seunghun@stackhpc.com> (cherry picked from commit 19fe0d4)
[DEPRECATION WARNING]: community.general.yaml has been deprecated. The plugin has been superseded by the option `result_format=yaml` in callback plugin ansible.builtin.default from ansible-core 2.13 onwards. This feature will be removed from community.general in version 12.0.0. Change-Id: I173240e0c7b5559a1ef1eea95067bd9d6c390ab4 Signed-off-by: Pierre Riteau <pierre@stackhpc.com> (cherry picked from commit 8882c87)
We weren't adding lookup plugins to the search path so external playbooks could not use these variables. Closes-Bug: #2142876 Change-Id: Ib4ebcd35d5e8f798ec47803f145684beef395d58 Signed-off-by: Will Szumski <will@stackhpc.com> (cherry picked from commit 06f29c1)
Add an opt-in nmstate network engine via `network_engine: nmstate` for host network configuration using NetworkManager/libnmstate. Implement nmstate rendering for Ethernet, VLAN, bond, bridge, routes, routing rules, and structured `*_ethtool_config`. Add OVS patch link (veth pair) generation in nmstate rendering. Change-Id: If3a92b059063b0aea299a51e76217c0d90a637a5 Assisted-by: various models Signed-off-by: Grzegorz Koper <grzegorzk@stackhpc.com> (cherry picked from commit 8b8ac1c) (cherry picked from commit 8728b9b)
- Merged feature list into single feature - Removed references to legacy backend - Removed fixes since nmstate has not been released yet Change-Id: Ieb2050b1e5ec04cd44ddc710d2478df23912745c Signed-off-by: Will Szumski <will@stackhpc.com> (cherry picked from commit bb1b030) (cherry picked from commit 5b1b36b)
Render VLAN ingress and egress QoS maps for the nmstate network engine. Assisted-by: Codex(GPT5.4) and Opus4.7 as an initial reviewer Change-Id: Ie749959774b9c0d25cc9b47250539b5dd75c53e4 Signed-off-by: Grzegorz Koper <grzegorzk@stackhpc.com> (cherry picked from commit 40fca0f) (cherry picked from commit a8f451b)
This prevents us needing the CRB and EPEL repositories to be enabled on Rocky hosts when building DIB images. Closes-Bug: #2141684 Closes-Bug: #2142501 Change-Id: Id3e610ad466212d3b8dde7a429ea66cc1562b047 Signed-off-by: Will Szumski <will@stackhpc.com> (cherry picked from commit 79bee73)
This sets the RequiredForOnline[1] property to false when no IP is configured. This prevents the interface from entering the degraded state[2]. [1] https://www.freedesktop.org/software/systemd/man/latest/systemd.network.html#RequiredForOnline= [2] systemd/systemd#575 (comment) Closes-Bug: #2139592 Change-Id: I266b720156c0d9cf5672d5dcc5a44a2a43888df6 Signed-off-by: Will Szumski <will@stackhpc.com> (cherry picked from commit cb59253)
github-actions
Bot
added
automated
Alex-Welsh
approved these changes
Jun 1, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR contains a snapshot of 2025.1 from upstream stable/2025.1.