aboutsummaryrefslogtreecommitdiff
path: root/docker/base
AgeCommit message (Collapse)AuthorFilesLines
2020-04-15CentOS 8: Switch last mentions of yum to dnfMark Goddard1-0/+2
Change-Id: I31e9742793cfb1abff9749083c9ce86000dae1af Partially-Implements: blueprint centos-rhel-8
2020-04-15CentOS 8: enable elasticsearch and kibana imagesMark Goddard1-5/+2
This is a follow up to I8b52b2630a72393bf4b9c7095fc67db6c36c27fa, which upgraded elasticsearch and kibana to 6.x. It did not enable the repositories or images for CentOS 8 however. This change enables elasticsearch and kibana images for CentOS 8. Change-Id: I7b375e493380c4e3d6b8c7b6f5ebc57c1b73043f Related: blueprint elasticsearch-kibana-version-upgrade
2020-04-15Remove support for CentOS 7Marcin Juszkiewicz3-145/+45
With the move to RHEL/CentOS 8 we no longer have Python 2 in our images so there is no need for checking which Python version (2.x or 3.x) is used inside of containers. We also no longer have to support yum as a value for distro_package_manager. Partially-Implements: blueprint centos-rhel-8 Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9
2020-04-14Merge "Upgrade Elasticsearch and Kibana to 6.x"Zuul2-7/+5
2020-04-09Merge "Follow up on RabbitMQ 3.8 upgrade"Zuul5-9/+0
2020-04-09Upgrade Elasticsearch and Kibana to 6.xSylvain Baubeau2-7/+5
Start using oss tagged binaries. These binaries contain only features that are available under the Apache 2.0 license. Implements: blueprint elasticsearch-kibana-version-upgrade Co-authored-by: Dincer Celik <hello@dincercelik.com> Change-Id: I8b52b2630a72393bf4b9c7095fc67db6c36c27fa
2020-04-09Merge "base/debian: pin erlang 22 for rabbitmq"Zuul1-0/+5
2020-04-08base/centos: influxdb repo is only on x86-64Marcin Juszkiewicz1-1/+8
Change-Id: I98147939ccfeeb7b3e86b5e33c427372663ecf9b
2020-04-08base/debian: pin erlang 22 for rabbitmqMarcin Juszkiewicz1-0/+5
Without pinning: INFO:kolla.common.utils.rabbitmq: rabbitmq-server : Depends: erlang-base (>= 1:21.3) but 1:21.2.6+dfsg-1 is to be installed or INFO:kolla.common.utils.rabbitmq: erlang-base-hipe (>= 1:21.3) but it is not installable or INFO:kolla.common.utils.rabbitmq: esl-erlang (>= 1:21.3) but it is not installable With pinning image builds. Change-Id: I26bbd081f70ac76bcf45ab4348068e463a313d88
2020-04-06Follow up on RabbitMQ 3.8 upgradeDincer Celik5-9/+0
Change-Id: I2273430b60e7b259cb687e7ec5c9f0885b625e0d
2020-04-06Upgrade RabbitMQ to 3.8Dincer Celik8-10/+59
Upgrade and pin RabbitMQ to 3.8. Upgrade Erlang to 22 to meet requirements: https://www.rabbitmq.com/which-erlang.html Start using bintray repository provided by RabbitMQ. Linaro builds will be used for aarch64. Implements: blueprint rabbitmq-version-upgrade Closes-Bug: #1848452 Change-Id: I3d775fd832f2603181da89009cebc1370a61a023
2020-04-03add dpdk_telemetry and logparser, use centos-release-opstools for C8Piotr Rabiega1-2/+2
Adds collectd-dpdk_telemetry and collectd-logparser packages to collectd RHEL-based image. dpdk_telemetry plugin collects DPDK ethernet device metrics via dpdk_telemetry library. Logparser is plugin for filtering and parsing log messages. Change-Id: I0c7c94e9fae9d11660f938b8d7d6be0f270c972f
2020-03-17base: fix pinning of libvirt for aarch64Marcin Juszkiewicz1-5/+15
Change https://review.opendev.org/#/c/712987/ added pinning for kibana and libvirt. In some cases it fails ;( This version works properly. Change-Id: I18a29dc4144fa53d371a6c5533e35181970429b0
2020-03-13kibana, nova-libvirt: handle it properly for non-x86Marcin Juszkiewicz2-1/+22
Upstream kibana package contains NodeJS x86-64 binaries so can not be used directly on non-x86 architectures. I took upstream packages, removed NodeJS binary from it and added 'nodejs' dependency. Package is present in my Linaro OBS repository where I keep other packages needed for aarch64 kolla run. Via APT pinning I mark them as not wanted so they are not used on any architecture with two exceptions: 1. libvirt - we need fixed version to be able to use ThunderX servers 2. kibana - to be able to run it at all For x86-64 upstream kibana package is used. Closes-bug: #1867365 Change-Id: I456402849022100bde1fffdfbf6292b35690f0f2
2020-03-03Use StorageSIG repos for Ceph in CentOS8Alfredo Moralejo3-46/+16
Storage SIG has built Ceph Nautilus and Ganesha for CentOS8 in CentOS Build System. Let's switch to use them in kolla. Change-Id: Id37dca84c4eb918aaf2d3c036ef5387fe75988dd
2020-03-01Add block labels to all DockerfilesChristian Berendt1-0/+2
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
2020-02-26Actually disable EPEL, and epel-modularMark Goddard1-1/+1
The disable_extra_repos macro accepts a list as its only argument. We were calling it like this to disable EPEL: disable_extra_repos('epel') The macro interpreted this as a request to disable three repos, e, p, l. Thanks Python! Type validation to be improved separately. Additionally, on CentOS 8 the EPEL repository was not included in the repository mapping file, repos.yaml. There is also another EPEL repository on CentOS 8, epel-modular, which is enabled by default after installing epel-release. This change adds mappings for epel and epel-modular repos to repos.yaml, and fixes the disabling of epel in the base image, as well as disabling epel-modular. There are some cases where EPEL is still used (it seemed a bit too easy...), and the repository has been enabled for these images: * bifrost-base (nginx) * ironic-conductor (C7 only, shellinabox) * freezer-base (C7 only, trickle) * gnocchi-base (C8 binary only, python3-boto3) * mariadb (pv) * mongodb (C7 only, mongodb) * nova-spicehtml5proxy (C7 only, spice-html5) * telegraf (C7 only, python2-pip) A few other things were changed: * ironic-conductor does not require the ceph repo * python3-pika is no longer installed in the openstack-base image Related: blueprint remove-epel Change-Id: I3761825239dfc462072383cde6276c4fb3e1bf12
2020-02-04aarch64: enable influxdb and telegraf for Debian/UbuntuMarcin Juszkiewicz1-0/+1
Turns out that upstream provides repos also for aarch64. CentOS one is not usable due to wrong arch name used (arm64 instead of aarch64). Change-Id: I1b4ef1fae0914d6826af5456cc9ea53bb26972ee
2020-01-31Merge "CentOS 8: Use upstream Ceph/master"Zuul2-0/+45
2020-01-30CentOS 8: disable repo_gpgcheck for grafana imageMark Goddard1-1/+0
DNF does not seem to accept keys imported by rpm --import for signing a repo (as opposed to packages). This causes it to prompt during package install, which does not work without a terminal in the build container. We have gpgcheck=1 for the grafana repo, so packages are at least signed. We don't have repo_gpgcheck elsewhere, so it seems reasonable to disable it for grafana. Change-Id: Ice120e8001fd9e8bb37ca4f2df26259cf798ee0e Partially-Implements: blueprint centos-rhel-8
2020-01-30Merge "CentOS 8: base image fixes for RabbitMQ, fluentd & InfluxDB"Zuul3-8/+8
2020-01-30CentOS 8: Use upstream Ceph/masterMichal Nasiadka2-0/+45
The only Ceph version that will support CentOS 8 is Octopus. It will be released end of March 2020 - so for now let's use master. Change-Id: I5955acb41e7346802d76f4f2b244cbf5c36f5bf2 Partially-Implements: blueprint centos-rhel-8
2020-01-29Merge "CentOS 8: base and openstack-base images"Zuul2-31/+111
2020-01-29CentOS 8: base image fixes for RabbitMQ, fluentd & InfluxDBMark Goddard3-8/+8
- Fix td-agent repo URL for fluentd. $releasever and $basearch variables were escaped in the repo URL. - Disable repo_gpgcheck for RabbitMQ. The rabbitmq-server 3.7 packages on packagecloud are not signed, which is why we have gpgcheck=0 for that repo. Previously repo_gpgcheck was set to 1, but this breaks DNF which does not seem to accept keys imported by rpm --import for signing a repo (as opposed to packages). This causes it to prompt during package install, which does not work without a terminal in the build container. This should be temporary as we will upgrade RabbitMQ to 3.8 soon. - Add InfluxDB repo back to list of repos to disable. Change-Id: Ibbb720390ff17e11249a5aa77163c15c0971209a Partially-Implements: blueprint centos-rhel-8
2020-01-24Add error message when merge failsAlex Schultz1-1/+9
If the source cfg directory contains a path (e.g. /etc/pki/ca-trust/extracted/) which is also bind mounted into the container as read-only, when it attempts to merge the paths together the resulting exception doesn't really indicate what happened. Change-Id: I73bbfd31586012e1fd64d30f9ce1d7eb2256d210 Related-Bug: #1860607
2020-01-21Merge "centos: disable EPEL by default"Zuul1-0/+1
2020-01-20Debian: ceph-osd wants smartmontools from backportsMarcin Juszkiewicz1-0/+5
Change-Id: Ibe82479d5225961758a96f763d9bb674731aab23
2020-01-15Debian: enable backports repoMarcin Juszkiewicz2-0/+7
We get Ceph 'nautilus' that way to be in sync with CentOS and Ubuntu. So far only ceph is taken from backports repo. Change-Id: I9d13ad8a6a610bcf000d3850b77af80d10d66ba7
2020-01-14Merge "base: use install_packages() macro to install packages"Zuul1-6/+2
2020-01-14Ubuntu: use local APT mirrors if possibleMarcin Juszkiewicz1-3/+3
APT has a way to fetch mirror list and autoselect best mirror. Change-Id: I8209770ca1353fd89aacef0859ca3a373645c6b2
2020-01-13Merge "base: drop commented part about site-packages in Ubuntu"Zuul1-14/+0
2020-01-13Merge "CI: use Debian/Ubuntu mirrors in base image"Zuul1-0/+2
2020-01-11Merge "base/ubuntu: use 'ussuri' packages from UCA"Zuul3-3/+3
2020-01-10base: drop commented part about site-packages in UbuntuMarcin Juszkiewicz1-14/+0
Turned out that since we commented mangling of system-wide Python packages nothing broke. So let's get rid of that part. Change-Id: I9e3a4424c584fb14cca50bb0b9392f7227161acc
2020-01-10base: use install_packages() macro to install packagesMarcin Juszkiewicz1-6/+2
Change-Id: I4cde9ca95dabf728a83ac338f7964911ac52f65a
2020-01-10CI: use Debian/Ubuntu mirrors in base imageMarcin Juszkiewicz1-0/+2
So far we built 'base' image using upstream mirrors and then replaced them with OpenStack infra ones. Let do that right after we copy own APT sources.list file. Change-Id: Icb745f628c1c50d9f20df022b08ddc46fccc270c
2020-01-10base/ubuntu: use 'ussuri' packages from UCAMarcin Juszkiewicz3-3/+3
Change-Id: Ia977d60e170efc1d4567bcea7f318b9d87233458
2020-01-09CentOS 8: base and openstack-base imagesMark Goddard2-31/+111
Adds support to the base and openstack-base images for CentOS 8. These images have been removed from the list of unbuildable images, and replaced with all dependent images. Change-Id: I18fba8a5c2f99b700990cbf41c76077a1ec2408a Partially-Implements: blueprint centos-rhel-8
2020-01-09Remove tgtd and scsi-target-utils support in CentOS/RHEL 8Maciej Kucia1-1/+5
In CentOS/RHEL 8 there is no scsi-target-utils package, nor is it available in EPEL. In RHEL 7 and beyond the LIO kernel subsystem can be used instead of the tgtd daemon. This change removes support for the SCSI target daemon on CentOS/RHEL 8. The 'tgtd' image is no longer available for CentOS/RHEL 8. Change-Id: I56f230d66f75dd0546325676278f91579f08c822 Signed-off-by: Maciej Kucia <maciej@kucia.net> Co-Authored-By: Maciej Kucia <maciej@kucia.net> Co-Authored-By: Mark Goddard <mark@stackhpc.com> Related: blueprint centos-rhel-8 Depends-On: https://review.opendev.org/631479/
2020-01-02centos: disable EPEL by defaultMarcin Juszkiewicz1-0/+1
Our images use 'scsi-target-utils' from EPEL and then can be built without it. So let's disable this repository right after installing package from it. Images can enable EPEL with 'enable_extra_repos' macro. Also added 'disable_extra_repos' macro as we have some images in a need. Change-Id: Id70474e7602b531b63fdc11ae690fd9ed33def74
2019-12-21CentOS 8: work around mod_ssl certificate issueMark Goddard1-0/+9
CentOS 8 has an issue with mod_ssl which produces an invalid Apache configuration in /etc/httpd/conf.d/ssl.conf. This causes the following error on startup: SSLCertificateFile: file '/etc/pki/tls/certs/localhost.crt' does not exist or is empty Work around this by generating certificates manually. Partially-Implements: blueprint centos-rhel-8 Change-Id: Id8bcefa3527575ba72fe37013787ba716e435ac8
2019-12-17docker: fix 'Empty continuation line found' warningsMarcin Juszkiewicz1-4/+4
Whitespaces suxx ;D Change-Id: I4bfd437c914680a5dcbc67dfe9b0a9a74e2eb35d
2019-12-16Merge "base: unify CentOS packages list"Zuul1-30/+9
2019-12-16Merge "Refactor Apache httpd setup"Zuul2-2/+20
2019-12-13Merge "Use APT pinning to set preferred version of RabbitMQ"Zuul1-0/+3
2019-12-13base: unify CentOS packages listMarcin Juszkiewicz1-30/+9
For infra images work we need 'base' image to be 'install_type' agnostic. So it will be the same when built for 'binary' or 'source' install type. Change-Id: Ied4a00e8866560d39004a34d6857ac62e22e2c0c
2019-12-13Merge "Build images with healthcheck scripts for core services"Zuul6-0/+62
2019-12-12Use APT pinning to set preferred version of RabbitMQMarcin Juszkiewicz1-0/+3
We want RabbitMQ 3.7.10-1 for Ubuntu. So set it in one place which is designed for such things instead of doing it everytime we want to install it. Change-Id: Ib2b2d4e392aaf77bcdec24f9f5551cdf15d32d91
2019-12-11Refactor Apache httpd setupMark Goddard2-2/+20
All Apache httpd setup has been moved to a new helper script, kolla_httpd_setup. This includes the existing clean of /run/httpd, /var/run/httpd, /tmp/httpd etc. Horizon has an additional bit of Apache config for Debian/binary, which has been kept in extend_start.sh for horizon. Change-Id: Ia2af74b69c151db0bd7e452460b0babcee50b282 Related: blueprint centos-rhel-8
2019-12-09Merge "base: use upstream dumb-init on all architectures"Zuul1-24/+0
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-06 10:52:06 +0000