Repository navigation
Synchronise master with upstream - #634
Merged
Merged
Conversation
We want the image IDs to be set when they are unset instead of erroring with missing dictionary key. Closes-Bug: #2165045 Change-Id: I07ea72bbc17b6a86a0f9eee138640f22409d5205 Signed-off-by: Will Szumski <will@stackhpc.com>
Set docker_storage_driver to use an undefined default in inventory so Docker runtime behavior is used unless explicitly overridden. Update container engine reference docs and example config comments to describe the runtime-default storage driver behavior, while keeping docker as the default container engine. Add an upgrade release note covering fresh-install vs upgraded-install behavior and the containerd image store transition. Change-Id: If6aa1edd520c8e6c224b00b8c537b0456316c55a Signed-off-by: Will Szumski <will@stackhpc.com>
The overcloud-etc-hosts-fixup playbook ran against all overcloud hosts unconditionally, including those not mapped through to the generated kolla-ansible inventory. This caused it to fail during overcloud host upgrade on such hosts. Skip the tasks on hosts that are not in the kolla_mapped_overcloud_host_True dynamic group, computed the same way as in kolla-ansible.yml. Since this playbook can run standalone via overcloud-host-upgrade.yml without kolla-ansible.yml having run first, the group_by task that creates the group is duplicated here. Closes-Bug: #2167869 Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Change-Id: Ie52edc45f6968dbba41dbc0c93f228994b48bef8 Signed-off-by: Will Szumski <will@stackhpc.com>
Kayobe installs its Galaxy role and collection dependencies by invoking ansible-galaxy directly. These subprocesses did not have ANSIBLE_CONFIG set, so a custom ansible.cfg in the Kayobe configuration path was ignored. In particular, a custom Galaxy server list (server_list) was not used and the default public Galaxy server was contacted instead. Set ANSIBLE_CONFIG for the ansible-galaxy invocations when a custom ansible.cfg exists in the configuration path. This matches the behaviour of ansible-playbook runs. Generated-By: opencode deepseek-v4-pro Change-Id: Ia9d7282e28509eadf41efeff534a179bedc64e57 Signed-off-by: Will Szumski <will@stackhpc.com>
The kolla-ansible role installs its Ansible collection dependencies by invoking ansible-galaxy directly. These subprocesses did not reliably pick up a custom ansible.cfg from the parent ansible-playbook, because Ansible runs tasks with the working directory set to the playbook directory, where the custom ansible.cfg is not discoverable. As a result, a custom Galaxy server list (server_list) was ignored and the default public Galaxy server was contacted instead. Set ANSIBLE_CONFIG explicitly for these tasks, preferring the Kolla Ansible ansible.cfg ($KAYOBE_CONFIG_PATH/kolla/ansible.cfg), falling back to the Kayobe ansible.cfg ($KAYOBE_CONFIG_PATH/ansible.cfg), and finally to the existing ANSIBLE_CONFIG environment variable. Generated-By: opencode deepseek-v4-pro Change-Id: I17b5731a96f1932208d5c30d47de0d3612ea3164 Signed-off-by: Will Szumski <will@stackhpc.com>
Prefer the site's OpenDev Ansible Galaxy mirror in CI, falling back to the public Galaxy server. This speeds up and stabilises role and collection installs in CI. Select the mirror using the zuul_site_mirror_fqdn variable. The tox jobs render a CI-only ansible.cfg from a template in a pre-run playbook and point ANSIBLE_CONFIG at it. It is deliberately not named ansible.cfg so that it is not auto-discovered by Ansible when running tox locally. The CI-injected ansible.cfg used by the deployment jobs is updated too. Generated-By: opencode deepseek-v4-pro Change-Id: I4c91889dc97510a128205731b1efc20d23c053c9 Signed-off-by: Will Szumski <will@stackhpc.com>
Kolla Ansible has dropped support for Swift [1], so remove the corresponding support from Kayobe, including the swift-rings and swift-block-devices roles and associated integrations and CI scripts. [1] https://review.opendev.org/c/openstack/kolla-ansible/+/945113 Change-Id: Ied168ab752519f464c9863ef6f1cd1486530546e Signed-off-by: Will Szumski <will@stackhpc.com>
Closes-Bug: #2168744 Related-Change: I961c71a3bcde1511604f34cc8caf5e8648d5bcb3 Change-Id: I822820ac0fd87221c4d24557b82de70e954e4a50 Signed-off-by: Thomas Sell <thomas.sell@bih-charite.de>
Closes-Bug: #2168529 Change-Id: I961c71a3bcde1511604f34cc8caf5e8648d5bcb3 Signed-off-by: Thomas Sell <thomas.sell@bih-charite.de>
Closes-Bug: #2168557 Related-Change: I70e39d10c592639d0ae20080459babd6cdf5980a Change-Id: Ib793160210ab6c08bf3f3ea4514de83df2573acc Signed-off-by: Thomas Sell <thomas.sell@bih-charite.de>
Starting the firewalld service does not guarantee that its D-Bus interface is available. The firewalld Ansible module decides whether to use online or offline (on-disk only) operations when it is imported. If the first zone is created before the interface is ready, it is written to disk only and is not loaded into the running daemon. Assigning an interface to that zone later then fails with INVALID_ZONE. Wait until firewalld can be queried before creating zones. Closes-Bug: #2167866 Generated-By: opencode deepseek-v4-pro Change-Id: I40ec20cd9831f5c8e4fa4b05ca247f5bf1682a31 Signed-off-by: Will Szumski <will@stackhpc.com>
Change-Id: I4defaad596922113f472134c3ef1a24ea38cf057 Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
This reverts commit 72eab43. Change-Id: I93c09c222ecac9ac1f43d35c9d1c4d9b88fd7121 Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
This reverts commit 2f33a28. Change-Id: Id5b5567bd53aa2a7117cc0d19598d1710e819179 Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
Closes-Bug: #2168538 Change-Id: Id5e822c9df9fa60345a40647e0a97763d4fda233 Signed-off-by: Thomas Sell <thomas.sell@bih-charite.de>
Change-Id: I20e816b1828d0673f82e065a656d919e2439545b Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
Change-Id: I29197e80e9fd5e990f20a74f4a63dbfb24df968b Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
Change-Id: I2095a27a1a386d88f8e1a8c665074fbd6652ab67 Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
Change-Id: I4af7b41aa4abcd118274b1233bfd028fbc7a25f3 Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
github-actions
Bot
added
automated
bbezak
approved these changes
Oct 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
4 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 master from upstream master.