Sync/gerrit/stable/victoria #99
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
This preserves the Debian-provided minor version - 10.5 in case of Bullseye in Wallaby and Xena - and is backported as a fix to Victoria and Ussuri (where it follows Buster and its 10.3). Closes-Bug: #1944410 Change-Id: I9704e5371a410cb1f69ec0367174e2b368961dc1 (cherry picked from commit b5422a6)
Closes-Bug: #1942038 Change-Id: Id488635110c6158dd23466250c9d57c4f0bc03ff (cherry picked from commit dfb65af)
Swift-recon-cron requires rw access to the lock path specified in in object-server.conf file. Currently it doesn't exist in Swift containers Closes-Bug: #1926203 Change-Id: Id3f824b741a5aa98efc7162fb7d49657e86a2bee (cherry picked from commit ff25b50)
libguestfs package fetched kernel-core one which fetched linux-firmware. We remove the last one and save ~500MB of space: before/centos-binary-nova-compute: 3.3GB after1/centos-binary-nova-compute: 2.71GB Closes-Bug: #1946801 Change-Id: I98cc19c95fcec07dd4e494c14c09938d754f1de0 (cherry picked from commit bbef984)
The nvme-cli package is required to get the nvme command executed by os-brick, which is used by nova-compute. We don't need to explicitely install it for centos binary images, as it is required by os-brick which is required by openstack-nova-common, but all other types of images were missing it. Change-Id: I754939da7636c57d2a8d5b83debb5d8a58e38432 Closes-Bug: #1953509 (cherry picked from commit 30eddf7)
TrivialFix The customization format of the variable name should contain the <image_name> [1]. This change fixes the name of the 'remote_apt_keys' variable in base Dockerfile. 1. https://docs.openstack.org/kolla/latest/admin/image-building.html#dockerfile-customisation Change-Id: I423db39e77f337a73d3d88e3dbd56469be45110b Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com> (cherry picked from commit cb99f46) (cherry picked from commit c8d3709)
Per [1]. It was agreed on during a Kolla IRC meeting. [2] This continues building non-stream images but using stream on the host. [1] http://lists.openstack.org/pipermail/openstack-discuss/2021-December/026408.html [2] https://meetings.opendev.org/meetings/kolla/2021/kolla.2021-12-22-15.01.log.html#l-53 Needed-By: https://review.opendev.org/c/openstack/kolla-ansible/+/823555 Change-Id: I080ad3bbc0e53cec2ac11bfd485c97d88388ef79
Closes-Bug: #1957159 Change-Id: I042da2234d0a06f1b7ddcac9eb6db8b86f13d205 (cherry picked from commit 0a536f4)
The Log4j version was bumped on GitHub [1] but it is still pending inclusion in a release of Apache Storm. Apply the alternative mitigation recommended by Log4j [2] of removing the JndiLookup class from the classpath. [1] apache/storm#3427 [2] https://logging.apache.org/log4j/2.x/security.html Change-Id: Ib3ecd73f9e39e320acb2c5f0962b8af9b1a817e9 (cherry picked from commit 448e4f5)
It is required only in Tacker and fails to be installed. And even Tacker does not use it... Change-Id: Ic8ebe4089c84f923c24697d632eb294a262059a8 (cherry picked from commit ec06d44)
Use distro provided GRUB efi instead of creating it like ironic GRUB setup doc[1]. This avoids below ubuntu ironic-python-agent images PXE booting failure. ---------- error: invalid magic number. error: you need to load the kernel first. Press any key to continue... ---------- This also fixes x86_64 uefi pxe booting issue by setting up GRUB efi for x86_64. Besides, GRUB setup only needs to do once at bootstrap stage. [1]: https://docs.openstack.org/ironic/train/install/configure-pxe.html#uefi-pxe-GRUB-setup Closes-Bug: #1879265 Change-Id: I8be5bdf5f1a62751aefe6bd0959e8f558fcfe591 (cherry picked from commit b6e057d)
Included patch: Remove missing collectd packages Since CentOS Linux 8 repository retirement from CentOS mirrors - we need to use CentOS Stream 8 version of Opstools repo. Listed below packages are missing from the repo, and according to the maintainer dpdk_telemetry is not going to show up at all (it's basically dead). The rest of the packages might show up at a later stage - but it's not a priority for the maintainer. - collectd-dpdk_telemetry - collectd-libpod-stats - collectd-sensubility - python3-sqlalchemy-collectd (cherry picked from commit 405fca9) Change-Id: I95ea4a66a80bf035f8bd1180790c7e0c85d759ed
When using Ironic with UEFI boot mode and iPXE booting, nodes will attempt to chainload iPXE using a Network Boot Program (NBP). This is configured in Ironic via [pxe] uefi_ipxe_bootfile_name, and the default since Xena is snponly.efi. In Wallaby and earlier releases, the default was ipxe.efi. These files need to be available in the /tftpboot directory of the ironic-pxe image. The current default of snponly.efi was not present for any supported distros. ipxe.efi was present for Debian/Ubuntu but not CentOS, which appends the architecture to the filename (e.g. ipxe-x86_64.efi). This change ensures that both ipxe.efi and snponly.efi exist in /tftpboot for all supported distributions, ensuring that both the current and previous Ironic defaults should work. Where these files have different names, we use symlinks to allow for any deployers overriding the filenames in configuration. Closes-Bug: #1959203 Change-Id: I79e78dca550262fc86b092a036f9ea96b214ab48 (cherry picked from commit 909710d)
This was temporary due to missing Ceph Nautilus repo on CentOS mirrors (after removing CentOS Linux content on EOL date). Change-Id: I86aa697b8def34e0cfb11d2f5ad903dd54e975ef (cherry picked from commit 7f38bce)
Change-Id: Iad7e7ebb1fbf4d14f20960d6257345db71d0e214 (cherry picked from commit 941d021)
RabbitMQ requires Erlang 23+ and soon will bump to 24+. On AArch64 we used version 22 as there was no other option. Now it is. Change-Id: I667ccda5bb4edbfbfb97dfb0cea264837ed05cae (cherry picked from commit f943c7d)
While handling permissions for directories, set_configs.py configures them same as for files - i.e. 0640 set in config.json which works fine for file will cause any potential subdirectories to lack traverse permission. Check and permission change was added to handle_permissions function to add +x if +r is present for user, group, others. Change-Id: Ic6e3ae4ff40c6ce5a5c0646ed309a2938903f6c0 (cherry picked from commit 1fe983d)
We should use the same Python OVS bindings package version as running OpenvSwitch. See related bug. Closes-Bug: #1961874 (cherry picked from commit 8e8a499) Change-Id: Ideae0c81d7c3833c8b0e22fce8691e9e42949ec5
Closes-Bug: #1964140 Change-Id: I4658a06b077d096ab9f2cb5070e39c98b5a27254 (cherry picked from commit da33e18)
Adds Cyrus SASL packages necessary for the DIGEST-MD5 and SCRAM-SHA-256 mechanisms. These can be used for libvirt SASL authentication. Change-Id: I13e19ca29eeab40cd08fa3afe2cdf7531867f81b Partial-Bug: #1964013 (cherry picked from commit e1efa9d)
…ictoria Change-Id: Id60a4fb12a013e7c771fe563492762c5355c7951
dougszumski
changed the base branch from
stackhpc/Victoria
to
stackhpc/victoria
markgoddard
approved these changes
Mar 15, 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.
No description provided.