Merge upstream Stein #60
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 is not needed plugin without any branches or releases. And wants Python 3 while we have Py2 for CentOS 7. Change-Id: I9cab91b82941ea125b16d19e68722ce41a1f11f2 14:41 < hrw> is tripleo-common-tempest-plugin your stuff? 14:43 <@EmilienM> yes and it does nothing. I thought we removed that? 14:43 <@EmilienM> apparently it's still here https://github.com/openstack/tripleo-common-tempest-plugin 14:43 <@EmilienM> we should burn it, weshay|ruck ^ 14:44 < hrw> EmilienM: also fine to drop from train? 14:44 <@EmilienM> burn it everywhere you can 14:44 < hrw> THANKS 14:44 <@EmilienM> it has never been useful 14:44 <@EmilienM> and people who started it left 14:48 <@WesHay|ruck> EmilienM, yup
Change-Id: Ic06bdcf30b7df7447b1bcbf2f688a9d148a59c67
Zuul handles jobs updates just fine, no need to run kolla build jobs when touching .zuul.d for different reasons. Change-Id: I201a194fa473a63b880cefc00febb543b40bcec8 (cherry picked from commit a008749)
Both issues affect Train and earlier releases. 1. Fix monasca-grafana by pinning more Ruby gems childprocess 3.0.0 and ffi 1.13.0 depend on Ruby 2.3. 2. Bump bifrost to 6.0.4 Bifrost had a fix to stop using the master branch of DIB which dropped support for Python 2. 3. Drop docker-client from OracleLinux sensu-client image The package fails to install due to a missing dependency on subscription-manager. Change-Id: Ida7e20833360bbca69c6aafc4f5d7cb375bb106f Closes-Bug: #1882070 (cherry picked from commit 3784d32)
Change-Id: Iaa16955b9b4b078901ce17934721b7780cc43b37
setuptools is missing from infra image - so it needs to be installed. Copy cat of a kolla-ansible change: https://review.opendev.org/#/c/735808/ Disables rsyslog build on oraclelinux (both source and binary) and tripleoclient (binary). Depends-On: https://review.opendev.org/737829 Change-Id: I6068abcbc0e73eeab77b0aa99983a95adc6defd3
If they are available then we do not need to build them. Especially AArch64 jobs will speedup (once wheels are built). Change-Id: I79af6c37950e156018a9204fbcc7417cd7d41012 (adapted by hand)
Change-Id: Id31883d93628958de61e8cd22de482c48b9c6c0b
A bit like we did for I3e0e86026f5a4a78473bed824cd1682d3a020cd5 we
should remove the nss-systemd lookup from containers. The reasons for
this are as follows:
1) Just like for I3e0e86026f5a4a78473bed824cd1682d3a020cd5
when this nss module is triggered it tries to talk to dbus.
It triggers a bunch of selinux denials and it makes little sense
to open all containers to talk to dbus.
In particular, if a container is run as non-privileged and bind-mounts
/run from the host, we will hit selinux denials like the following:
type=USER_AVC msg=audit(1592337775.860:74119): pid=1284 uid=81 auid=4294967295 ses=4294967295 subj=system_u:system_r:system_dbusd_t:s0-s0:c0.c1023 msg='avc: denied { send_msg } for msgtype=method_call interface=org.freedesktop.DBus member=Hello dest=org.freedesktop.DBus spid=406228 scontext=system_u:system_r:container_t:s0:c162,c886 tcontext=system_u:system_r:system_dbusd_t:s0-s0:c0.c1023 tclass=dbus permissive=0 exe="/usr/bin/dbus-daemon" sauid=81 hostname=? addr=? terminal=?'UID="dbus" AUID="unset" SAUID="dbus"
2) It just makes little sense in a kolla-world to have containers
talk to dbus/systemd and it saves us some time when a lookup triggers
the systemd module for whatever reason. Especially because the
nss-systemd module does a few things which are not useful in a container
(ensures that the root and nobody users and groups remain resolvable,
SystemD's DynamicUser= feature, provide Lookup API via Varlink)
The sed regex gives us the wanted results:
$ diff -u /etc/nsswitch.conf.orig /etc/nsswitch.conf
--- /etc/nsswitch.conf.orig 2020-06-19 07:18:10.974580755 +0000
+++ /etc/nsswitch.conf 2020-06-19 07:20:12.260230103 +0000
@@ -53,9 +53,9 @@
# group: db files
# In order of likelihood of use to accelerate lookup.
-passwd: sss files systemd
+passwd: sss files
shadow: files sss
-group: sss files systemd
+group: sss files
hosts: files dns myhostname
services: files sss
netgroup: sss
Related-Bug: #1883849
Change-Id: I81e5b7abf4571fece13a029e25911e9e4dece673
(cherry picked from commit dc2ddfa)
brtkwr
approved these changes
Aug 18, 2020
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.