wallaby: Sync upstream stable/wallaby #93
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
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)
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)
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 Template override used to temporarily use Ceph Nautilus repo from RDO. Change-Id: I5f446fc276e245c1e6974ceeb6ff3dccd84ee502 (cherry picked from commit 405fca9)
With [0] the version of td-agent being installed was pinned, which isn't sustainable in the long run, so we drop the pin. Latest version of the elasticsearch gem no longer works with older (OSS) versions of Elasticsearch. This is fixed by downgrading the version of the elasticsearch gems. Backport includes 711ec08 [1]. [0] Iefcdd3100b7e3c5320bc5f1286a18251bdeab885 [1] I353ef9b6b8da0e726c17ad2e06995d3690731e1d Related-Bug: 1930867 Closes-Bug: 1954759 Closes-Bug: 1960444 Signed-off-by: Dr. Jens Harbott <harbott@osism.tech> Co-Authored-By: Radosław Piliszek <radoslaw.piliszek@gmail.com> Change-Id: I3045786e863b098d7339d1066aef6c857aa5f97f (cherry picked from commit a8e6924)
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
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)
markgoddard
approved these changes
Feb 16, 2022
jovial
added a commit
to stackhpc/stackhpc-kayobe-config
that referenced
this pull request
Feb 16, 2022
This is built with the following PR applied: stackhpc/kolla#93 It brings in the following change to the ironic-pxe container: https://review.opendev.org/c/openstack/kolla/+/828846
jovial
added a commit
to stackhpc/stackhpc-kayobe-config
that referenced
this pull request
Feb 25, 2022
This is built with the following PR applied: stackhpc/kolla#93 It brings in the following change to the ironic-pxe container: https://review.opendev.org/c/openstack/kolla/+/828846
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 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.
No description provided.