Sync upstream stable/victoria #77
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
bintray is being shut down 1st of May 2021, rabbitmq docs direct users to packagecloud - so let's move. For Victoria and below, includes I6a3ba599af3deedd450b4ffff6b86a0c04628340 (base: drop Linaro OBS key for CentOS and Ubuntu) Change-Id: I499251d13ca77aea2215f8a879b7bb8dd51f1c9f (cherry picked from commit 641b936)
Package installation fails: Setting up trove-common (1:14.0.0-2~bpo10+1) ... install: cannot stat '/usr/share/trove-common/api-paste.ini': No such file or directory dpkg: error processing package trove-common (--configure): installed trove-common package post-installation script subprocess returned error exit status 1 Change-Id: Ia4d326601d14c5d55e8f67d8996458fc796583ea (cherry picked from commit 51c3c90)
Now that we run without erlang pinned by the repository itself, let's pin it on our side. Change-Id: Ifa491b102ad0db7f6dc645ca552d83b53bcf3b46 (cherry picked from commit b54789d)
RabbitMQ 3.8.14 is the last version with Erlang 22 support Change-Id: I1d68a47f78b925af76c44c61af7da1465371e721 (cherry picked from commit 0ec6049)
It was missed previously. CI did not detect it because it ignores apt security issues. That gets fixed in Ic5abc4b87fd76f87aba383abf43e95ba70629fcb Change-Id: I11256c674c42e35496146ff64fee1e8e04c30d2c (cherry picked from commit 4443139)
The UCA packages seem to be removing the swift user from the kolla group. Explicitly add it after installation. Closes-Bug: #1905279 Change-Id: I51c7c6e2f520a582de0409025eb5d1a6da2952a2 (cherry picked from commit aa3208e)
kolla-ansible runs ovs-dpdkctl.sh inside container, and ovs-dpdkctl.sh requires crudini. Change-Id: Iad84dd12432befe9250c50d4094b1e5e2e0cf8ee (cherry picked from commit 6585332)
Infra mirrors get their indices rebuilt to avoid broken indices (due to partial update). Unfortunately, this wipes out the cryptographic signatures. Our approach so far was disabling apt security features globally. However, this is not a valid choice for external repos. It hid an issue we introduced with new RabbitMQ repos missing proper keys installed in the image. This caused permanent failures outside of our CI. Our process should be as close as possible to users' experience. This patch makes CI trust only the mirrors that have their indices rebuilt (so infra mirrors). Change-Id: Ic5abc4b87fd76f87aba383abf43e95ba70629fcb (cherry picked from commit c364c8b)
[[ is bash only In many distributions /bin/sh == bash but not in Debian and derived where it is dash (very simple POSIX shell). Change-Id: I2b084ea78b236623b174473f411bae04e624a3e9 (cherry picked from commit f0c3567)
Change-Id: I5a6e7de57e0d123634c37807fd75bcc980abac73 (cherry picked from commit 5338b55)
Backport below Wallaby switching bullseye to buster. Closes-Bug: #1931544 Change-Id: I8460a4159c8da8ae0b856867e068d30fbffb4d34 (cherry picked from commit 789c9c3)
The recent inclusion of Fluentd 1.12.x in Centos/Ubuntu packages causes a significant number of logs to fail to appear in the Elasticsearch or Monasca output plugins. The logs appear to sit in a local buffer, and are only flushed when Fluentd is restarted. The same issue persists in the most recent release (1.13.0), so for now we pin the td-agent package to 4.0.* which should restrict Fluentd to the 1.11.x release where we don't see this issue. Backport to Victoria. Change-Id: Iefcdd3100b7e3c5320bc5f1286a18251bdeab885 Closes-Bug: #1930867 (cherry picked from commit 6d0882e)
There are two cases where pip installs kolla share into ~/.local/share/kolla: - with `pip install --user kolla` - with `pip install kolla` as non-root This patch helps kolla find the share dir in these cases. Closes-Bug: #1930544 Change-Id: I0b3eb6744a34a601266179fb358510a5c500e6ba (cherry picked from commit db78657)
The CentOS 8 Advanced Virtualization repository recently added libvirt
7.0.0. The current version of libvirt-python fails to build against it:
running build
/usr/bin/pkg-config --print-errors --atleast-version=0.9.11 libvirt
/var/lib/kolla/venv/bin/python3.6 generator.py libvirt /usr/share/libvirt/api/libvirt-api.xml
Found 480 functions in /usr/share/libvirt/api/libvirt-api.xml
Found 0 functions in libvirt-override-api.xml
Generated 389 wrapper functions
Missing type converters:
char ** *:1
char **:1
ERROR: failed virDomainAuthorizedSSHKeysGet
ERROR: failed virDomainAuthorizedSSHKeysSet
error: command '/var/lib/kolla/venv/bin/python3.6' failed with exit status 1
We need at least libvirt-python v6.10.0.
Closes-Bug: #1931817
Change-Id: If69536387513ca221e03a80878016532a41aef87
(cherry picked from commit 715d799)
Patch to correctly copy monitoring_policy.json into /etc/openstack-dashboard. Policy was misplaced, and not being enforced. Note that by current default policy, admin doesn't not have Monitoring access. Closes-Bug: #1928408 Change-Id: I4faabdfa9c273fc61b536e6ce88b8d71ab2fc581 (cherry picked from commit f68dfb8)
mnasiadka
approved these changes
Jun 23, 2021
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.
With conflicts resolved.