Synchronise victoria with upstream #16
Merged
Conversation
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
* build CentOS stream overcloud root disk images * build CentOS stream IPA images Cherry picked from commit 1cac2cc without the os_release variable. Change-Id: If4b74bf7aa2464582db74df8d20decc4fc3b2668
Any interface not matching the convention: <interface>.<vlan id> will be assumed to untagged when generating the config drive. The link type will be set to `phy` in `network_data.json` instead of `vlan`. This prevents invalid config drive configuration from being generated. Change-Id: I00e7615581c7a214e0ee8e8f04cacdbb3ea4131a Story: 2009910 Task: 44736 (cherry picked from commit dd95618)
These are only neccesary on network and compute nodes. Co-authored-by: Mark Goddard <mark@stackhpc.com> Change-Id: Id5af3969da63150e892201f7518f50a3da73e852 Story: 2009911 Task: 44740 (cherry picked from commit bb9da9f)
When some custom config files are used, generation of local configuration for Kolla Ansible is not idempotent. This happens because an executable permission is applied recursively in a directory, then reverted on regular files. Change-Id: I8cc9531570b76a8282a95c4036324e9d1025d7cb (cherry picked from commit 8de9d53)
This change is a combination of previous changes, with some adaptations for changes in Victoria: * Ib59c8bc2d8938eca18c943bb2e66ed185152a739 * If657bf5b0117812d3c53942464cc41cf86cc8ad5 The overall effect is to disable IPA and overcloud host image builds in seed jobs, since these can be unreliable. Change-Id: I3c59fa140a89d7d761846cc712e65aa0efda1363
When a kolla-ansible group is composed of a kayobe group with the same name and of at least one other kayobe group, kayobe would generate an invalid Ansible inventory such as: [compute:children] controllers compute Because the top-level group should already be defined, we only need to add as children the kayobe groups using different names. Change-Id: I88bdf1e3d0c08271ac8938ae2f9ac3f9fee1efa5 Story: 2009927 Task: 44798 (cherry picked from commit 0c190a2)
There is no mechanism to check which agent would be used and build all the possible agents, but forgot the linuxbridge one. Change-Id: I955a2c12b5143a63422cab50c74191bc22c63932 Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com> (cherry picked from commit a8860c4)
Upper constraints should be defined using os_networks_upper_constraints_file rather than os_openstacksdk_upper_constraints_file because of [1]. 1. https://github.com/stackhpc/ansible-role-os-networks/blob/v1.5.3/meta/main.yml#L22 TrivialFix Change-Id: Ic779bb80f20fd72c73f0df05e048c851fe8491ee Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com> (cherry picked from commit a224579)
The disks field in lvm_groups should be a list, and the percentage needs to be relative to something. Change-Id: I422c7113cdba8f5c155ff1f7d3d118066bd28e96 (cherry picked from commit 568ab77)
This is old and deprecated configuration settings for Swift not needed anymore because kolla-ansible correctly configure glance-api.conf and glance-swift.conf since Idddbf2ce741e0486d60e1de88c77a7f0332a5a2b when kolla_enable_swift variable set to true. This change can be backported through all releases till the Train. Change-Id: I5273edc8265f115519f499e85fe12f8d22306c4b Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com> (cherry picked from commit 10b8c1e)
The kolla_passwords module overrides parameter may contain sensitive data, including passwords and SSH keys. It should be protected via no_log. Without this, the parameter value may be exposed in Ansible logs, or if level 3 verbosity is used, Ansible output. This change adds no_log to the parameter. Change-Id: I3f499d63d19ba7f7372b401bd2da23ce627f18e5 (cherry picked from commit 51a5739)
Previously we were not applying an MTU defined in Kayobe networks.yml to the provisioning and cleaning networks in Neutron. This could lead to issues when nodes communicate with the Ironic and Inspector APIs. Change-Id: Id9418e4e88c52056412daa22462aa611bfcc59ae (cherry picked from commit cd24b6d)
For a long time [1] we have net_mask filter, so no need to use ugly combination of the net_cidr filter together with ansible's ipaddr filter. 1. https://opendev.org/openstack/kayobe/commit/dc45036c92cb28fd4e9f2d9c84a03438bf7ad26f TrivialFix Change-Id: I16d721539e5956f0d86503dd5b01ea608b129873 Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com> (cherry picked from commit 0751a31)
github-actions
bot
added
automated
markgoddard
approved these changes
Jun 21, 2022
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 victoria from upstream.