Upstream Train sync 2021-01-11 #20
Open
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
1. When cyborg images build completed, the /etc/cyborg folder is not exits, and there is not confs, especially the api-paste.ini 2. When masakari images build completed, it's configs is missing, this ps add them together cyborg should keep consistence with the other images[1], this PS to add it. [1]: https://github.com/openstack/kolla/blob/master/docker/nova/nova-base/Dockerfile.j2#L137 Change-Id: I8a802617952f80cfb9f906398054ef6d17559589 (cherry picked from commit 2e6d2f1)
There are cases when epel repos are not setup in that case dnf config-manager will fail. Let's ignore the failure in such cases. This change is needed only for Train branch. Change-Id: Ic1b74ccc7c8e6ee2e4c025e8b29150d1a1d96f2f Partially-Implements: blueprint centos-rhel-8 Signed-off-by: Bhagyashri Shewale <[email protected]>
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)
`ndctl` is a utility for managing the nvdimm subsystem required by Nova for attaching PMEM(persistent memory) namespaces to guests [0]. [0]: https://docs.openstack.org/nova/latest/admin/virtual-persistent-memory.html Change-Id: I8ed1b6c1d0985b2a73206bd9249a5664cd80c912 Closes-Bug: #1870455 (cherry picked from commit f9ea23d)
Change-Id: Ic1f94f2f69aa19455093526fab2951f1d556342d
Change-Id: Ia0a11b4c47c56fb0407abcb8cb330e9ebce812a4 (cherry picked from commit 68d2562)
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 7.2.1 Bifrost had a fix to stop using the master branch of DIB which dropped support for Python 2. Change-Id: Ida7e20833360bbca69c6aafc4f5d7cb375bb106f Closes-Bug: #1882070
Change-Id: If4c30a91ba9a3d0dd7f157e590f14133c0733bac
This allows to write collected data via amqp. Change-Id: Ieb88fd60d177f19a635ada9366193e57c516f90b (cherry picked from commit 8bfa655)
…-monitors 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/ Fixes also cyborg-api to use py3 mod_wsgi in centos8 Temporarily disables masakari-monitors build, because it fails on centos8 due to problems with libvirt-python===5.7.0 (upper-constraints): Missing type converters: virTypedParameterPtr:1 ERROR: failed virConnectSetIdentity Depends-On: https://review.opendev.org/#/c/736744/ 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
Change-Id: I8c223d6872ef10fa48dd496bfe5a1ebfa9637583
Change-Id: I84e7773fc47f7fcd8e28ee9743021116e0b71b76
We need to be sure that we use exact same version every time. So fetch upper-constraints.txt file earlier and use it while installing virtualenv package. Change-Id: I61711a878b2bda9f0d2e88966f13121dfcddfda7 (cherry picked from commit 13f9303)
Change-Id: I0c872bc404b3df96b9da58b8efe3b64c174d9c48 Closes-Bug: #1884203
Pulls in this fix: https://review.opendev.org/#/c/736610/ Partial-Bug: #1885104 Change-Id: I014c9a52b2f61a86e3a8adafdf4783c3f58148ef
On Centos 8 we have Elasticsearch and Kibana 6, but Logstash (used by Monasca) is stuck on 2 which is not compatible. See the product compatibility matrix [1]. This adds Logstash 6, so that Monasca can use the full ELK 6 stack on Centos 8. Note that Monasca doesn't officially support ELK 6, but it does work. [1] https://www.elastic.co/support/matrix#matrix_compatibility Partial-Bug: #1884090 Change-Id: Id6f79e301cc109a029913f5628bab1848c138e7f
In the Centos8 images, Storm fails to start since it cannot find Python. This patch ensures that it can by setting the PYTHON env var. Change-Id: If6663b2f6dfadfd6a6db5e4aaca4eb782b87161f Closes-Bug: #1876461
Centos 8 forced the upgrade of Elasticsearch from 5 to 6 in Train. This forced the upgrade of Logstash and Kibana. Partial-Bug: #1884090 Change-Id: Ide308f7973db1f97b410ecae7d9ab049156afb7a
boto part cherry picked from change [1]. Disabling mongodb build due to missing packages in CentOS repos. [1]: https://review.opendev.org/755339/ Change-Id: Idf980eedcd318b88101b3a82442b9b99838fd84c (cherry picked from commit 34460d6)
Change-Id: I1184825371724c9a7d0a47331f3912519d94e8b6
This patch disables the lower-constraints job as it started failing and we agreed during the PTG to drop it anyway. [1] For Train and below additionally blacklist bandit 1.6.3 as it was improperly released as a universal wheel. [2] [1] http://lists.openstack.org/pipermail/openstack-discuss/2020-October/018445.html [2] PyCQA/bandit#663 Change-Id: Icfedd16ef9aed84e9f9be939e832c35e0d735efe (cherry picked from commit bc0a41c)
Move all extra jobs to the experimental pipeline. Cores should know when to test these extras. This is to reduce the load when a fix is needed in the base image or across all images. Otherwise, due to how CI works, we incur the cost of running all these jobs on each recheck. Change-Id: Ia4aecd2fbe70d1760e0ddc401d06510914dbd1fb (cherry picked from commit 5797c3a)
To better utilise caches during the working week, we decided to publish only weekly (as opposed to daily). This is due to DockerHub-imposed limits. Change-Id: Ib4710dae09e991c0ad21c44a64b2617e0fd4fdc6
Curator got requirements sorted out upstream and builds fine now without hack. This reverts curator part of https://review.opendev.org/c/openstack/kolla/+/755339/ Change-Id: Iabe5b9684a7bf0e39a7dca824e6705b5069560bf (cherry picked from commit 7db2f10)
Backport this until Train. CentOS 8.3 renamed system repos. [1] This caused failures when disabling and enabling. More details in the referenced bug report. Notice CentOS 8.2 and below will no longer work. Train backport also includes some fixes for the fallout from the new pip resolver. * cap bandit<1.6.3, since bandit no longer supports Python 2. * mark kuryr-libnetwork unbuildable for source images. * mark almanach-base & dragonflow-base unbuildable for Debian & Ubuntu source images. * Don't install networking-hyperv in source neutron-server images. pip complains of a conflict. (https://bugs.launchpad.net/kolla/+bug/1907826) [1] https://wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011#Yum_repo_file_and_repoid_changes Change-Id: I2d67b3ed7b7c521bc755ec9a87365c9962a9eeff Closes-Bug: #1907213 Closes-Bug: #1907826 Co-Authored-By: Radosław Piliszek <[email protected]> Depends-On: https://review.opendev.org/766211 Depends-On: https://review.opendev.org/767157
freezer scheduler runs with root privilege which is needless Change-Id: I9345a123838dd5ff5a4f4c5d37f40ac233807104 (cherry picked from commit 91cb616)
backup_full() saves the history name in $BACKUP_DIR/last_full_date. backup_incremental() attempts to read from $BACKUP_DIR/last_full_date into $LAST_FULL_DATE. After the read attempt; if $LAST_FULL_DATE is zero length then $(date +%d-%m-%Y) is used. Change-Id: I4172b814d5d95ae3debbc1cf3feaeee2e2bec9bd Closes-bug: 1897948 (cherry picked from commit ccfe65b)
nova-compute uses daxio to cleanup vpmem backend device on instance delete. If the daxio binary is missing in the nova-compute container instance delete fails. daxio is provided in centos via daxio, in ubuntu via the pmdk-tools package. Conflicts: docker/base/apt_preferences.debian Also: nova-compute: daxio on CentOS 8 is x86-64 only Change-Id: Ifb5948653565e2ae902783762e20e33527020efe Closes-Bug: 1907124 (cherry picked from commit 6176d54) (cherry picked from commit 40a1c7a) (cherry picked from commit 14b96abd6f6a6671d4dc97035b9ece61145cdcf2)
This is necessary if e.g. Prometheus is used. Then the ceilometer-upgrade is not needed. Signed-off-by: Christian Berendt <[email protected]> Change-Id: I8690e5543e6b5f37f41fe35f659910fc869c034f (cherry picked from commit ea8592b)
This patch is adding libffi-dev to build_packages for Debian/Ubuntu which is fixing monasca-grafana build. Change-Id: I67f93687d70f1c8c92719857cbf74971d9a17ae6 (cherry picked from commit 88d4895)
The centos environment ironic-inspector use iptables filter need install iptables rpm package. Change-Id: I67081a37977dd6de37a67fcd012e002f2e46743f Closes-bug: #1906635 (cherry picked from commit ad1b8e2)
The chart repository is gone and the building fails. Change-Id: I205eb2209cb0ccaecee247b95c65ed65bf4ed9e0
…e" into stable/train
Affects: Ussuri, Train As part of the CentOS 8 support, we added a kolla_httpd_setup script, however this was not used for Cyborg or Freezer. This has been fixed since Victoria as part of commit 032804e, but this was not backported to Ussuri. Closes-Bug: #1909981 Co-Authored-By: Radosław Piliszek <[email protected]> Change-Id: I88e5bcf35207670b8611aeee3072215a7d7eb6e5 (cherry picked from commit e0d8772)
This may break Monasca which can be fixed when it's fully backported to Rocky. (cherry picked from commit 7861211)
This adds a libvirt exporter image for use with Prometheus. Partially-Implements: blueprint libvirt-exporter Change-Id: Ice2af99a323496d3821762851b663899d15f569a (cherry picked from commit f08bad6)
cASO is an OpenStack accounting exporter. For more detail see: https://github.com/IFCA/caso Conflicts: kolla/common/config.py Change-Id: Ief2c554a64ef6cc971635d7e2a718f63c310fbf6 (cherry picked from commit e4c1466)
This change was requested upstream. (cherry picked from commit 7404e5d)
This uses the binary release from github. (cherry picked from commit 59200c6)
It is recommended to run cASO as a cron job. (cherry picked from commit a854266)
I've bumped the ids into a range well outside of the standard kolla range to avoid collisions in the future. (cherry picked from commit 20d4ead) Change-Id: I9180385300df989fa776fd0bcba8830887951fb3
the current puzzler is why prometheus_arch isn't being set: INFO:kolla.common.utils.prometheus-jiralert:Step 5/8 : ARG prometheus_jiralert_url=https://github.com/free/jiralert/releases/download/${prometheus_jiralert_version}/jiralert -${prometheus_jiralert_version}.linux-${prometheus_arch}.tar.gz ... INFO:kolla.common.utils.prometheus-jiralert: ---> Running in 36f580e96266 INFO:kolla.common.utils.prometheus-jiralert:curl (https://github.com/free/jiralert/releases/download/1.0/jiralert-1.0.linux-.tar.gz): response: 404, time: 0.422, size: 9 In rocky it was being set like: {% if base_arch == 'x86_64' %} ENV prometheus_arch=amd64 {% elif base_arch == 'aarch64' %} ENV prometheus_arch=arm64 {% else %} ENV prometheus_arch={{ base_arch }} {% endif %} in: docker/prometheus/prometheus-base/Dockerfile.j2 That variable is undefined in stein: openstack@ab679ad (cherry picked from commit 74e52bf)
the current puzzler is why prometheus_arch isn't being set: INFO:kolla.common.utils.prometheus-jiralert:Step 5/8 : ARG prometheus_jiralert_url=https://github.com/free/jiralert/releases/download/${prometheus_jiralert_version}/jiralert -${prometheus_jiralert_version}.linux-${prometheus_arch}.tar.gz ... INFO:kolla.common.utils.prometheus-jiralert: ---> Running in 36f580e96266 INFO:kolla.common.utils.prometheus-jiralert:curl (https://github.com/free/jiralert/releases/download/1.0/jiralert-1.0.linux-.tar.gz): response: 404, time: 0.422, size: 9 In rocky it was being set like: {% if base_arch == 'x86_64' %} ENV prometheus_arch=amd64 {% elif base_arch == 'aarch64' %} ENV prometheus_arch=arm64 {% else %} ENV prometheus_arch={{ base_arch }} {% endif %} in: docker/prometheus/prometheus-base/Dockerfile.j2 That variable is undefined in stein: openstack@ab679ad (cherry picked from commit 74e52bf)
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.