Synchronise 2024.1 with upstream#566
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)
The known_hosts module returns a failure on Rocky Linux 9.8 when given a comment line from ssh-keyscan output. Fix by excluding them with grep. Depends-On: https://review.opendev.org/c/openstack/tenks/+/990686 Change-Id: I29e7e8a7480009fd359b8aa8b867b11900109f00 Signed-off-by: Pierre Riteau <pierre@stackhpc.com> (cherry picked from commit e303339)
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
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 2024.1 from upstream unmaintained/2024.1.