summaryrefslogtreecommitdiff
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2022-03-11libvirt: add Cyrus SASL packages for DIGEST-MD5train-eolMark Goddard2-0/+11
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 e1efa9d257c45e5f99364974ea66a6d6ba5a5605)
2022-03-09CentOS Stream 8: drop build deps repoMark Goddard1-9/+2
Also rename delorean-train-testing to delorean-train-deps. Change-Id: I1f9688d8b2f5414ef94e5bbf0ec5a771fe252040
2022-03-09CentOS Stream 8: drop CentOS RabbitMQ 3.8 repoMark Goddard2-9/+0
We need 3.7 in Train in order to handle the transition from CentOS 7 to 8. The RabbitMQ image ends up with 3.7.28, but for certainty, this change removes the CentOS RabbitMQ 3.8 repository that was added with the switch to Delorean for CentOS Stream 8. Change-Id: I120be2b28a7214e6b03976719319e4208d8050ab
2022-03-04Build CentOS Stream 8 imagesMichal Nasiadka3-7/+30
This is part of the effort to allow a migration path for operators using CentOS 7 and Train today. Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/831265 Change-Id: I75373eb21c4269c20f72603ad4cf162a472de25b (cherry picked from commit 67d6d28b6208cc004a50f19be1386d88c2404bc4)
2022-03-02Remove missing collectd packagesMichal Nasiadka2-11/+1
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 Change-Id: I5f446fc276e245c1e6974ceeb6ff3dccd84ee502 (cherry picked from commit 405fca90f2c8d3763ac56ce8b925611d136bba6c)
2022-01-27Mitigate two Log4j vulnerabilities in Apache StormPierre Riteau1-0/+5
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] https://github.com/apache/storm/pull/3427 [2] https://logging.apache.org/log4j/2.x/security.html Change-Id: Ib3ecd73f9e39e320acb2c5f0962b8af9b1a817e9 (cherry picked from commit 448e4f56aa6218a66b0074329d322c0b6089b2e6)
2022-01-26CI: make it work againMarcin Juszkiewicz7-6/+17
Python changes: - limit pip to 20.x as this is last version working on both Python 2 and 3. - cap 'setuptools' to be older than 58 to have use_2to3 functionality (fixes 'anyjson' installation) - upgrade pip in 'elasticsearch-curator' image to get it built on CentOS 7 Unbuildable images: - 'bifrost-base' under CentOS 8 (Error: Cannot find a valid baseurl for repo: epel) - 'monasca-grafana' under CentOS 7/8 - 'sensu-client' under CentOS 7 (aws-eventstream requires Ruby version >= 2.3) - dropped *-upgrade CI jobs as Stein is EOL - pin 'qpid-proton-c' package for CentOS 7 to not install EPEL one (cinder-volume, openstack-base and tripleoclient) - bump 'libvirt-python' in 'masakari-monitors' to 7.10.0 (newer branches install package from distribution but CentOS 7 lacks it) - pin 'unf_ext' gem in Sensu images as CentOS 7 lacks Ruby 2.2+ (fixed sensu-server) - install 'ca-certificates' for newer Let's Encrypt certificates support (so we can fetch upper-constraints) - make Zuul fetch openstack/requirements project files (make 'openstack-base' pass) (like 2nd fix) Co-Authored-by: Pierre Riteau <pierre@stackhpc.com> Closes-Bug: #1943617 Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/826464 Change-Id: I8ee32e53cda581493b2a4bb73ca72ab05014b9d4
2021-06-16Enable Debian updates repoRadosław Piliszek1-0/+3
Backport below Wallaby switching bullseye to buster. Closes-Bug: #1931544 Change-Id: I8460a4159c8da8ae0b856867e068d30fbffb4d34 (cherry picked from commit 789c9c3b84e84796ac8211112fa29f415f560c88)
2021-06-15Fix build of masakari-monitors imagePierre Riteau1-1/+1
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. Change-Id: If69536387513ca221e03a80878016532a41aef87
2021-05-10Merge "[CI] Trust only infra mirrors and fix APT mirrors" into stable/trainZuul2-3/+5
2021-05-10[CI] Trust only infra mirrors and fix APT mirrorsMarcin Juszkiewicz2-3/+5
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). For Train, fixed missing override parts as well. And it includes also: - I8209770ca1353fd89aacef0859ca3a373645c6b2 - Icb745f628c1c50d9f20df022b08ddc46fccc270c - Id3b55ac470a977be7ee7decdef3b49e8d89a130f Change-Id: Ic5abc4b87fd76f87aba383abf43e95ba70629fcb Co-Authored-By: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> (cherry picked from commit c364c8be85f4653bf7af1c7ac0378823553e7441) (cherry picked from commit 4a482380408d107c59119b379add34f4b8e87ad7)
2021-05-07Merge "Fix Mistral source images to respect upper-constraints" into stable/trainZuul1-1/+1
2021-05-06rabbitmq: Move to packagecloudMichal Nasiadka8-23/+15
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) For Train, fixes also the order of rpm gpg key imports and yum operations (otherwise CentOS 8 [with dnf] fails because repos are enabled early and keys are missing). And it also pins erlang version where required. Change-Id: I499251d13ca77aea2215f8a879b7bb8dd51f1c9f (cherry picked from commit 641b936bc7fd33203a80bb3827fce7c44d010476)
2021-04-08base: configure curl before first useMarcin Juszkiewicz1-1/+3
We want to have all uses of curl behave the same so we ship config file for it in all images. So do it at start of image so 'base' makes use of config too. Change-Id: I95aa64f0b292cd020574dbedd320ef90529cc7a4 (cherry picked from commit 4328a5b3cc0e90e32952ecfeab2b63407ee8e22a)
2021-02-17Fix several issues (Train)Marcin Juszkiewicz2-3/+3
* sensu: drop Ubuntu support Upstream removed Ubuntu repositories. Train/Stein only * Bifrost: pin IPA builder to 2.4.0 Train & earlier IPA builder master branch now requires diskimage-builder 3.4.0, but Python 2 is supported only up to DIB 2.38. This change works around the issue by pinning IPA builder to 2.4.0, which has a Python 2 compatible dependency on DIB. Change-Id: Ice125e101a689fd3df9d1cd9a093a026f9747a3e
2021-01-29Fix Mistral source images to respect upper-constraintsRadosław Piliszek1-1/+1
Backport to all supported branches. Change-Id: I4a13bbe959e3324f05d5cf78a3be2415eb2ba7ec (cherry picked from commit 004d9eb5d575fcb140b4d90fb30ced0a81dd3e66)
2021-01-26Merge "nova-compute: 'pmdk-tools' is x86-64 only in Ubuntu 'bionic'" into ↵9.3.1Zuul1-2/+4
stable/train
2021-01-26Merge "nova-compute: provide needed deps for debian/aarch64" into stable/trainZuul2-0/+9
2021-01-26Merge "Bump prometheus-openstack-exporter version to 1.3.0" into stable/trainZuul1-1/+1
2021-01-26nova-compute: 'pmdk-tools' is x86-64 only in Ubuntu 'bionic'Marcin Juszkiewicz1-2/+4
Victoria+ branches use Ubuntu 'focal' where this package is available for aarch64 as well. Change-Id: I2076ab4a634418df5863174588a72e6c2ce8f05e
2021-01-26nova-compute: provide needed deps for debian/aarch64Marcin Juszkiewicz2-0/+9
'daxio' needs 'pmdk-tools' which needs 'buster-backports' on aarch64. Train only. - backports repo was enabled in ussuri with move to ceph nautilus - 'pmdk-tools' we pinned with move to QEMU 5 in ussuri Change-Id: Ia5234c7355669a4aa9bb1c45660930aee553e220
2021-01-26Merge "Improve pip install process for offline deployment." into stable/trainZuul7-35/+14
2021-01-24Improve pip install process for offline deployment.Gaël THEROND (Fl1nt)7-35/+14
* "Use distribution-provided pip" * "Use python's pip module invocation method" * "Install pip earlier in order to avoid multiple installation" * "Remove pip_version variable requirement and call" (cherry picked from commit b93c40a3635fbce72e48dc29120e50484cba36ca) - fixed source type builds. - in openstack-base: install virtualenv using upper-constraints (just like in kolla-toolbox) Co-authored-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Co-authored-by: Radosław Piliszek <radoslaw.piliszek@gmail.com> Depends-on: https://review.opendev.org/c/openstack/kolla-ansible/+/772198 Closes-bug: #1893204 Change-Id: Id0e738044a1931f9d611a7281a48ea4a593f1cf1
2021-01-23Merge "Add a storm-base image" into stable/trainZuul4-8/+16
2021-01-23Add a storm-base imageMark Goddard4-8/+16
Refactor storm image dependencies. Previously we had: base -> storm -> monasca-thresh Both storm and monasca-thresh images are final, and each includes a footer. This causes issues when the footer expects to be at the end of the image, or there to be only a single footer. In particular, since I2592a736206eaec811290e9fbdbf2540c0518ffe, the footer used in CI jobs reverts to the public package mirrors. This change introduces a storm-base image, and refactors the dependency chain: base -> storm-base -> storm base -> storm-base -> monasca-thresh Related-Bug: #1902101 Change-Id: I53e8ba8d4baa4434cf3c49ed94d1f7cb44099bee (cherry picked from commit 93204ecfeca7ba394bd4c3872147357aa708f46e)
2021-01-23Remove footer block from intermediate imagesMark Goddard7-4/+11
Only the final image in a hierarchy should have the footer block. neutron-infoblox-ipam-agent image still has two footers because it inherits from the neutron-server image. We set the user to root at the beginning of that Dockerfile, so that headers and footers have the right context. Change-Id: I95e5bb5583be2a76e289749e8adfc303a4e7197a (cherry picked from commit 4b792b9a43bee3bfb499cea14924527550f2bce0)
2021-01-22CI: Use Docker proxy for pulls + Ruby fixesMichał Nasiadka2-2/+4
For Train (due to CentOS 7) includes as well: - sensu-client: Pin simpleidn Ruby gem simpleidn Ruby gem started requiring Ruby 2.2. - monasca-grafana: Pin git Ruby gem fpm Ruby gem started requiring git Ruby gem git Ruby gem started requiring Ruby 2.3 Change-Id: I0c4d5e1ea16c6677813a334b38b3a22ad811531d Co-Authored-By: Radosław Piliszek <radoslaw.piliszek@gmail.com> Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/772077 (cherry picked from commit a8c12def858b57349207cab5fa8dabb3c23bdfa0)
2021-01-11Bump prometheus-openstack-exporter version to 1.3.0Jorge Niedbalski1-1/+1
Change-Id: Ie54703e6ecf6a3332ef6f769fa500091068ea155 Signed-off-by: Jorge Niedbalski <jnr@metaklass.org>
2021-01-04Fix Freezer & Cyborg API startup on CentOS9.3.0Radosław Piliszek2-16/+2
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 032804e5a0ddf89f7726880d1b57dd492d7d5c07, but this was not backported to Ussuri. Closes-Bug: #1909981 Co-Authored-By: Radosław Piliszek <radoslaw.piliszek@gmail.com> Change-Id: I88e5bcf35207670b8611aeee3072215a7d7eb6e5 (cherry picked from commit e0d8772efa25b478467afcd3e2ecf2643ea471ff)
2020-12-23Merge "Fix build of monasca-grafana" into stable/trainZuul1-12/+13
2020-12-23Merge "Install iptables in ironic-inspector container" into stable/trainZuul1-1/+4
2020-12-23Merge "use freezer user for freezer_scheduler container" into stable/trainZuul1-0/+2
2020-12-22Install iptables in ironic-inspector containerdouyali1-1/+4
The centos environment ironic-inspector use iptables filter need install iptables rpm package. Change-Id: I67081a37977dd6de37a67fcd012e002f2e46743f Closes-bug: #1906635 (cherry picked from commit ad1b8e20dfc6f743f1945b9e036cf29597b79053)
2020-12-21Fix build of monasca-grafanaMichal Arbet1-12/+13
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 88d48953357c67de14ff83f0361825b05fc71a07)
2020-12-21ceilometer: do not fail when using an unsupported database typeChristian Berendt1-3/+0
This is necessary if e.g. Prometheus is used. Then the ceilometer-upgrade is not needed. Signed-off-by: Christian Berendt <berendt@betacloud-solutions.de> Change-Id: I8690e5543e6b5f37f41fe35f659910fc869c034f (cherry picked from commit ea8592b077ceccfeb3089d901e6f46252f024881)
2020-12-18Merge "Add daxio for nvdimm scenario" into stable/trainZuul1-2/+18
2020-12-18Add daxio for nvdimm scenarioMartin Schuppert1-2/+18
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 6176d54179109e85dee5ebc29a7726bcb05f76a9) (cherry picked from commit 40a1c7a6ebabb1554e0ce7b54d6b356c2bac1ce5) (cherry picked from commit 14b96abd6f6a6671d4dc97035b9ece61145cdcf2)
2020-12-18mariadb: Fixes incremental backup failure when full not created todayabraden1-3/+11
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 ccfe65b5f7fe437141f342421488c176038fddb0)
2020-12-17Merge "elasticsearch-curator: drop botocore workaround" into stable/trainZuul1-3/+1
2020-12-17use freezer user for freezer_scheduler containerwuchunyang1-0/+2
freezer scheduler runs with root privilege which is needless Change-Id: I9345a123838dd5ff5a4f4c5d37f40ac233807104 (cherry picked from commit 91cb6166129be975afbd2adc3b43e27931788910)
2020-12-15Support CentOS 8.3abraden2-5/+3
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 <radoslaw.piliszek@gmail.com> Depends-On: https://review.opendev.org/766211 Depends-On: https://review.opendev.org/767157
2020-12-15elasticsearch-curator: drop botocore workaroundMarcin Juszkiewicz1-3/+1
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 7db2f100195c7aecde449e47d758c784850bd456)
2020-11-06curator: Add wheel to elasticsearch-curatorMichal Nasiadka1-1/+4
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 34460d636e9e62f30a0d17eda2d743658ccb0b33)
2020-10-16Merge "Add sysfsutils to nova-compute ubuntu source" into stable/trainZuul1-0/+1
2020-10-14Checks for heat_user_domain explicitlyFabian Bermel1-2/+4
The script should check for heat_user_domain explicitly instead of matching on "heat" Closes-Bug: #1839824 Change-Id: Iac83444487d2aa96a0f90086029f43922d1e7856 (cherry picked from commit 5e946cac490077011709c7587dc5e0b06927464f)
2020-10-14Add sysfsutils to nova-compute ubuntu sourceRadosław Piliszek1-0/+1
This fixes the FC Cinder backend usage in Nova. Change-Id: I036cfe3af3dd96625f986a820c78a10e6558b086 Closes-bug: #1884484 (cherry picked from commit 0c8702c96f852eae7a1fb784a260c01c15fb86f3)
2020-10-06Add collectd-libpod-stats to imagepleimer1-0/+1
This patch adds the installation of collectd-libpod-stats as part of the collectd image. The package is available in the centos-opstools repo. Collectd-libpod-stats monitors resource usage of running containers on a host, specifically those managed by the libpod library. Adapted for Train to affect only CentOS/RHEL 8 image. Upstream: https://github.com/pleimer/collectd-libpod-stats Change-Id: I12efbaae9c0795f29c2f68158127509fd1b543b0 Signed-off-by: pleimer <pfbleimer@gmail.com> (cherry picked from commit 094a49d41dd1f071cf5f6ac4220611e0ddd69c40) (cherry picked from commit ce7cd478449227acd0eca7fdd1670624efc22f3b)
2020-09-17Merge "Fix kolla_set_configs --check with a directory" into stable/trainZuul1-5/+6
2020-09-14Fix Masakari dashboard policy file locationMark Goddard1-1/+1
The horizon image copies the masakari dashboard's policy file to Python site packages, but it should go to /etc/openstack-dashboard. This allows the dashboard to be seen by non-admins, although it fails to load. We get an error like the following in horizon.log: No policy rules for service 'instance-ha' in /etc/openstack-dashboard/masakari_policy.json This change fixes the issue. Change-Id: I8ede183c76a830de06ce6524dc3f6f6944b182c1 Closes-Bug: #1894240 (cherry picked from commit 4f44870376f47c6a65bd02cc83d2ef39fd1f5ae9)
2020-09-14Fix kolla_set_configs --check with a directoryMark Goddard1-5/+6
There are several issues with kolla_set_configs --check: 1. We calculate the destination path incorrectly when comparing a file in a directory, due to passing arguments to os.path.relpath in the wrong order 2. For directories that have not changed, we also attempt to compare them as files, which fails when they are open()ed. 3. If the config JSON does not have a config_files key, it fails with a KeyError. The first two issues affect the fluentd container, which specifies directories as the source, without using a glob. The third affects OVN containers. This patch fixes these issues. Closes-Bug: #1890567 Change-Id: I8921befe51da4282121443849177a7ca5ebe8822 (cherry picked from commit c5320eb22386c34d83435fa0b9aa03b178996b52)
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 16:48:02 +0000