Synchronise xena with upstream #142
Merged
Conversation
This file contains 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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Debian OpenStack Team backports many packages to get their stuff done. Sometimes something goes wrong: INFO:kolla.common.utils.kolla-toolbox:The following packages have unmet dependencies: INFO:kolla.common.utils.kolla-toolbox: git : Depends: git-man (< 1:2.30.2-.) but 1:2.34.1-1~bpo11+1 is to be installed INFO:kolla.common.utils.kolla-toolbox:E: Unable to correct problems, you have held broken packages. So let pin out problematic packages as we are fine with bullseye version of git. Change-Id: I8c740655c7f7803d9ab36dac79d30e35e65dd586 (cherry picked from commit 2553c18)
This adds a libvirt exporter image for use with Prometheus. Partially-Implements: blueprint libvirt-exporter Change-Id: Ice2af99a323496d3821762851b663899d15f569a (cherry picked from commit afce859)
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/797190 Change-Id: I8ada844a2b034547c045248b324c1955ad4cf6ae (cherry picked from commit 02e8e76)
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)
The contextfilter decorator was deprecated in jinja2 3.0.0, and has been
dropped in 3.1.0. This results in the following warning, and failed
attempts to use filters:
[WARNING]: Skipping plugin (filters.py) as it seems to be invalid:
module 'jinja2' has no attribute 'contextfilter'
This change switches to use the pass_context decorator. The minimum
version of Jinja2 is raised to 3 to ensure pass_context is present.
This change has been updated to also support Jinja2 2.x releases,
since the Wallaby upper constraints specify 2.11.3. In practice, most
users will not use UC to install kolla.
CoAuthored-by: Mark Goddard <[email protected]>
Change-Id: I5efab66e487e06abd1a56af97d7e7caa1ebc880d
AArch64 builds fail with "AttributeError: install_layout". This is due to setuptools issue in Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1003252 Switching setuptools to use distutils from stdlib makes error go away. Backports: Xena, Wallaby (this is where it was first reported). Change-Id: I97102e18e4ec47bca94d17d964936f039580b06b (cherry picked from commit 497b40f)
The -q (aka --disable) option only works if it is the first parameter on the command line. Change-Id: Ia9ab0bdc95e658c17e5be5abefcf96f1c05ee84f Closes-Bug: #1967272 (cherry picked from commit 196b742)
Debuntu binary images did not got packages installed. Change-Id: Ie28e8580406f3f805500ed4020895e5e9ebf7c31 (cherry picked from commit a8fcb02)
elasticsearch-oss package fails to install if we install it with Java: INFO:kolla.common.utils.elasticsearch:could not find java; set JAVA_HOME INFO:kolla.common.utils.elasticsearch:error: %prein(elasticsearch-oss-0:6.8.23-1.noarch) scriptlet failed, exit status 1 INFO:kolla.common.utils.elasticsearch:�[91mError in PREIN scriptlet in rpm package elasticsearch-oss Backport down to ussuri needed. Change-Id: I72d7920acd8d15941c8c57a4186186212b273a38 (cherry picked from commit 976465c)
Currently, kolla sets file permissions at _set_properties_from_file() method, but no logs are emitted here. This can make it difficult to investigate the cause of issues which are caused by setting permissions. This patch makes _set_properties_from_file() output a log. Closes-Bug: #1966825 Change-Id: I91116931aa30fd2c5e51ed1ac04663fcfa4a5f36 (cherry picked from commit 4c071fc)
A recent change to git [1] introduced a new behaviour to work around a CVE [2] that disallows any git operations in directories not owned by the current user. This may seem unrelated to installation, but it plays havoc with PBR, which calls out to git to get to get revision history. So if you are "pip install"-ing from a source tree you don't own, the PBR git calls in that tree now fail and the install blows up. When using type=source, kolla clones the repository, then creates a tarball from it, which is ADDed to the image. The ownership of the files in the tarball is preserved, which in this case will be the user running kolla-build. Since the Docker build runs as root, we hit the PBR issue. Our solution is to make sure that any tarball we generate from git sources have all files owned by root:root so that the root user is able to use git commands when building container images. [1] git/git@8959555 [2] https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24765. Closes-Bug: #1969096 Related-Bug: #1968877 Co-Authored-By: Mark Goddard <[email protected]> Change-Id: I2cbf1f539880d512aa223c3ef3a4b19ee18854ac (cherry picked from commit c4fda7b)
This reverts commit 09c890b. Reason for revert: That change caused all Kolla's work items to be transferred. This includes tarballs, their extracted contents, cloned git repositories, etc. to also be transferred to swift which takes extra time, pollutes logs and decreases the stability of jobs slightly (the mechanism is not designed for this kind of load). The collection of templated Dockerfiles in CI has to be reimplemented if it is wanted. Change-Id: Ideaf66ce18c993802f4d20f490caa47cec0dde5e (cherry picked from commit f33ef03)
We have 'quiet' mode where only minimal data is printed to the console. But there were no logs at all then. This change generates log files (if 'logs-dir' argument is used) during quiet build. Also enables 'quiet' mode for CI so Zuul will not have to parse 29MB JSON file each time. Change-Id: If7d5c2807f0947a8bbbc1ceb8531c9b9c9287c1f (cherry picked from commit 0cf5b1d)
I have no idea how Go works. This change make build happen. Change-Id: I09ea136c7354143f45f856d5e8d8ed1192879622 (cherry picked from commit 9630032)
There are no packages in UCA. http://lists.openstack.org/pipermail/openstack-discuss/2022-May/028419.html Change-Id: Iaf5ce2b7276b275b21d892d0044a126ab901507f (cherry picked from commit 3d83717)
Adds Cyrus SASL packages necessary for the DIGEST-MD5 and SCRAM-SHA-256 mechanisms. These can be used for libvirt SASL authentication. Follow up to I13e19ca29eeab40cd08fa3afe2cdf7531867f81b. Partial-Bug: #1964013 Change-Id: Ic4b6171789c3d360317599310492771bd78828ec (cherry picked from commit 5cc480a)
This is I2cbf1f539880d512aa223c3ef3a4b19ee18854ac extended to fix the case when a git repository is used with a git repo. This is probably a rarer use case but, still, we use it in CI for in-review changes testing. Change-Id: I77b0dcd2e9dfd8ea8390a471b80c8954b67ef91b (cherry picked from commit b888f68)
Following up on [1], Bifrost also needs to use correct u-c and, surprise-surprise, this is set via a third variable, this time environment one for the bash script. Oh well. Let's do it. This has the added benefit of not requiring additional download of u-c as it reuses the already existing one. [1] https://review.opendev.org/c/openstack/kolla/+/842276 Change-Id: I2cc79c476d089977b57006dd4ce2e9a8c6206aa1 (cherry picked from commit 633c89b)
Regarding rabbitmq and erlang. Change-Id: I6bc8b489a810849744c8bead6b9e350c5d3e36b7 (cherry picked from commit 240b3cf)
Several people use Kolla behind firewall/proxy. Internal mirrors are often in use then. We do not provide a way to replace repos.yaml file in an easy way which may lead to complicated solutions or template overrides. This patch adds a way to provide own copy of repos.yaml file. Change-Id: I0b07da22fea27e0ff4e90aaad19e50d84ff9a121 (cherry picked from commit 213190a)
Since Ibdbcf459608711ac64e7fefb1707f6708d68e750 merged to master we need to pin diskimage-builder to latest stable tag with support of the Python3.6 until we move to CentOS9. Change-Id: I9f9e381716611b71584ecf8b371f8b7f45c694ee Signed-off-by: Maksim Malchuk <[email protected]> (cherry picked from commit 1b259ec)
This change fixes an issue with 'apt-get update' command and stop container building with erroneous source repositories. Change-Id: I5ce2eb66a647e1805f086aa37942bf5d13eb4106 Signed-off-by: Maksim Malchuk <[email protected]> (cherry picked from commit bce06d2)
markgoddard
approved these changes
Jun 13, 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 xena from upstream.