summaryrefslogtreecommitdiff
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2020-04-03Collectd: ignore failure of disabling epel reposyatinkarel1-1/+1
https://review.opendev.org/#/c/710822/ added disabling of epel and epel-modular repos. 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. Partially-Implements: blueprint centos-rhel-8 Change-Id: I4aeb3971b82d461a305264490e829aaacfac9b24
2020-03-25CentOS 8: Drop trickle install to build freezerMark Goddard1-3/+5
Trickle was previously installed from EPEL7, but is not available in EPEL8. It does not appear critical to the functioning of freezer, so drop it to allow freezer images to build for CentOS 8. Change-Id: I3e12ab51e9f01d383268d75ce72903686564ada6 Partially-Implements: blueprint centos-rhel-8 (cherry picked from commit 548144fc3c2564c9c44a3a42372a1f3b8f2fef34)
2020-03-20CentOS 8: Enable hacluster and masakari imagesMarcin Juszkiewicz1-0/+1
CentOS 8.1 came with HA repo. So we can use it. hacluster-pcs image is disabled as we lack 'crmsh' package for it. Partially-Implements: blueprint centos-rhel-8 Co-Authored-By: Mark Goddard <mark@stackhpc.com> Change-Id: I1c786eda399eca4464c9d68ac040c2965350f775 (cherry picked from commit 92224ccb518c90d7c269158d074d811aee2f05f0)
2020-03-18Merge "Fix Horizon build after switch to pyscss2 which lacks binary wheel" ↵Zuul1-0/+2
into stable/train
2020-03-18Fix Horizon build after switch to pyscss2 which lacks binary wheelRadosław Piliszek1-0/+2
It now requires pcre-dev package to finish building. Change-Id: I4e003c9aa32579d467c489a53741e20ced2f4b52 Closes-bug: #1867888
2020-03-17kibana, nova-libvirt: handle it properly for non-x86Marcin Juszkiewicz4-8/+35
manual backport from master changes: - https://review.opendev.org/#/c/712987/ - https://review.opendev.org/#/c/713403 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: I955619d6992f8714ae753dc155e248d255340ecf
2020-03-16Merge "Build collectd image for CentOS8" into stable/trainZuul1-1/+4
2020-03-16Merge "Add cinderlib RPM to cinder-volume" into stable/trainZuul1-0/+2
2020-03-16Merge "Adds python3-systemd for ansible deploy interface" into stable/trainZuul1-0/+3
2020-03-13Build collectd image for CentOS8yatinkarel1-1/+4
Required packages are available in RDO repo, so this should build fine. Partially-Implements: blueprint centos-rhel-8 Change-Id: I14cc9d0f2c5d72c6dad89de2ac6dcffda8510285 (cherry picked from commit 2089165388c6da609973d9083f40b163382dbcc3)
2020-03-12Merge "Add ssh clients to Ironic Conductor container" into stable/trainZuul1-0/+4
2020-03-12Merge "Clean up collectd dockerfile" into stable/trainZuul1-13/+8
2020-03-12kibana: enable for non-x86 on Debian/UbuntuMarcin Juszkiewicz1-1/+8
As upstream generated 'all' package as 'amd64' one I took some time and repackaged it. manual cherry-pick from https://review.opendev.org/#/c/707787/ Change-Id: Ie84ed771ffa9ecd70b945673727895c8edad30eb
2020-03-12Clean up collectd dockerfileMatthias Runge1-13/+8
for CentOS 7 and CentOS 8. Change-Id: I46d567f7ddadf4a40a4af9652248b50b3ac7be80
2020-03-12Add ssh clients to Ironic Conductor containerAntony Messerli1-0/+4
Adds ssh clients to Ironic Conductor container for ansible deploy interface. Change-Id: Ib995c6ebe5ee76ee1a39e4b5918a79bd61b87a01 Closes-Bug: #1862079 (cherry picked from commit 7234e8b2f72275c85caa146a6d9e49d1ab8281b7)
2020-03-12openstack-base: pin setuptools < 46 to get horizon workingMarcin Juszkiewicz1-0/+5
pyScss used by Horizon fails to work with setuptools > 46 version. It's last release was in 2016 so probably no one fix it. Let make sure that we get older version of setuptools. Broken due to https://bugs.launchpad.net/kolla/+bug/1866961 Change-Id: I2a3fa657a3e1a9b8b0acb0b50bd4f3e98078f4ff
2020-03-11Adds python3-systemd for ansible deploy interfaceAntony Messerli1-0/+3
When doing a source install, ironic doesn't have python3-systemd as a dependency and the current ironic-conductor container doesn't install the required dependencies which causes the ansible deploy interface to fail with the error, "Systemd bindings do not exist". This adds the needed dependencies when doing a source build. This installs the needed files for both rpm and deb builds on python 2.x and 3.x. Change-Id: I5d1bcb0f7d7902b4e122c12697483433bcf52ca2 Closes-Bug: #1861427 (cherry picked from commit 4a67e58f7971641c55247f02985e13ef391ca7ab)
2020-03-06Merge "Use StorageSIG repos for Ceph in CentOS8" into stable/trainZuul2-3/+14
2020-03-05Use StorageSIG repos for Ceph in CentOS8Alfredo Moralejo2-3/+14
Storage SIG has built Ceph Nautilus and Ganesha for CentOS8 in CentOS Build System. Let's switch to use them in kolla. Depends-On: https://review.opendev.org/711214 Change-Id: Id37dca84c4eb918aaf2d3c036ef5387fe75988dd (cherry picked from commit 0c6312968214e403b5a408d69df17bd0a9267095)
2020-03-04Add cinderlib RPM to cinder-volumeGorka Eguileor1-0/+2
Finding the root cause of attach/detach operation on volumes can be very complicated. This patch adds the cinderlib RPM to the cinder-volume container, which can, in many scenarios, really help debug these issues on live nodes (controller and compute) without affecting our running services. Change-Id: I5f55c892b1ae9eba9b6af8a45ef7dfad515c7b05 (cherry picked from commit a1b74b76977f8300938c6a6a9adf67af6cd50086)
2020-02-28Fix kolla_toolbox_pip_virtualenv_packages overrideXing Zhang1-1/+1
backport: train, stein, rocky Override in filter needs to follow the rule: <image_name>_<call_type>_<override/append/remove> `call_type` for `kolla_toolbox_pip_virtualenv_packages` should be `pip_virtualenv_packages`, and `pip_packages` can't match with `kolla_toolbox_pip_virtualenv_packages`, this makes the value can't be overrode in template override. Change-Id: I1dbe2dfd4bce73ce2285f45f997d45b5dcc95f4c Closes-bug: #1865119 (cherry picked from commit 74d5a66e6bf744ad936d702443a8d64be86441ba)
2020-02-28Merge "CentOS 8: Relax ironic iPXE EFI bootloader location" into stable/trainZuul1-1/+1
2020-02-28Merge "CentOS 8: Install python in the base image (Train only)" into ↵Zuul1-0/+9
stable/train
2020-02-28Merge "CentOS 8: Allow SSH access to keystone_ssh and nova_ssh" into ↵Zuul2-1/+16
stable/train
2020-02-28Merge "CentOS 8: Use upstream Ceph/master" into stable/trainZuul2-0/+37
2020-02-28Merge "CentOS 8: Remove shellinabox from ironic-conductor" into stable/trainZuul1-2/+6
2020-02-28CentOS 8: Install python in the base image (Train only)Mark Goddard1-0/+9
This was missed due to the difference in base package lists between master and stable/train, with train having separate lists for binary and source, and master having a single combined list. Partially-Implements: blueprint centos-rhel-8 Change-Id: I4417ad735933df786651f3190cc3250b9b306027
2020-02-26Merge "CentOS 8: Update packages in images" into stable/trainZuul18-34/+132
2020-02-26Merge "CentOS 8: base and openstack-base images" into stable/trainZuul6-37/+139
2020-02-26Merge "Remove tgtd and scsi-target-utils support in CentOS/RHEL 8" into ↵Zuul3-5/+17
stable/train
2020-02-26CentOS 8: Relax ironic iPXE EFI bootloader locationMark Goddard1-1/+1
CentOS 7 had ipxe.efi. CentOS 8 has ipxe-i386.efi and ipxe-x86_64.efi. Use a wildcard to copy any of these that are present. Change-Id: I6d409e56b424a039f5aff9af86ca1b026c2c6286 Partially-Implements: blueprint centos-rhel-8 (cherry picked from commit adcdef7d85b4d1a89592f01ae4902b43b768f0d3)
2020-02-26CentOS 8: Allow SSH access to keystone_ssh and nova_sshMark Goddard2-1/+16
The centos:8 image contains a /run/nologin file, which prevents SSH access to it. Remove this file in the keystone_ssh and nova_ssh images to allow login via SSH. Change-Id: I59dc2c4207af6812501b6c6acdb34e51a3e848c4 Partially-Implements: blueprint centos-rhel-8 (cherry picked from commit 892ae92d971fd7a2c8d39e416512bb69f7fd833f)
2020-02-26CentOS 8: Use upstream Ceph/masterMichal Nasiadka2-0/+37
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 (cherry picked from commit 70423f19596f92ed01c89e7d62f8c46a6dba6a23)
2020-02-26CentOS 8: Remove shellinabox from ironic-conductorMark Goddard1-2/+6
shellinabox is used by ironic-conductor to provide a browser-based shell to access the consoles of nodes. It is not used by all console drivers, and is not used in the integration with nova serial consoles. The package was previously installed from EPEL7, but is not currently provided by EPEL8. This change removes the package to allow the ironic-conductor image to build. Change-Id: I210d9fddd6948dab1feb5abf59a50bce86f21f0f Partially-Implements: blueprint centos-rhel-8 (cherry picked from commit 397651ec4b5b93a55d0b8b8f69dfb37dd85cfc8d)
2020-02-26Merge "vitrage-base: honor distro_python_version" into stable/trainZuul1-1/+1
2020-02-26CentOS 8: Update packages in imagesMark Goddard18-34/+132
* Some further changes for python2 vs python3 packages * Allow rabbitmq 3.7.*, since a newer erlang is available * Switch from qemu-img-ev to qemu-img on CentOS 8 * bridge-utils no longer available on CentOS 8 * libvirt-daemon-driver-lxc no longer available on CentOS 8 * Mark some more images buildable for CentOS 8 Depends-On: https://review.opendev.org/709553 Change-Id: Iaf5b68ff6d944ae730ca0b1d5832172c106a6c08 Partially-Implements: blueprint centos-rhel-8 Partially-Implements: blueprint centos-rhel-python-3 (cherry picked from commit 4b4e26262b9e03190c639481fb60a8f4f92c532a)
2020-02-26CentOS 8: base and openstack-base imagesMark Goddard6-37/+139
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. This change also includes backports of a number of other changes related to the base image: * CentOS 8: disable repo_gpgcheck for grafana image (Ice120e8001fd9e8bb37ca4f2df26259cf798ee0e) * CentOS 8: base image fixes for RabbitMQ, fluentd & InfluxDB (Ibbb720390ff17e11249a5aa77163c15c0971209a) Change-Id: I18fba8a5c2f99b700990cbf41c76077a1ec2408a Partially-Implements: blueprint centos-rhel-8 (cherry picked from commit 3c618a1f6f0beca723e031fbe323b159400ad08f)
2020-02-24vitrage-base: honor distro_python_versionMarcin Juszkiewicz1-1/+1
Change-Id: I27c71c1237dc010531495440e6094d8b129f6c48 (cherry picked from commit 90babe35d0e075ad15904bb2263e1dd019f10532)
2020-02-24Remove tgtd and scsi-target-utils support in CentOS/RHEL 8Maciej Kucia3-5/+17
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/#/c/702417 (cherry picked from commit 946749312f31c36d9dac8ff3a545894e9043190d)
2020-02-24nova: use proper uefi package names under CentOS/RHEL 8Marcin Juszkiewicz1-0/+16
Change-Id: I92be17ef1ce0f81ab3f49433a0d1e688874ba64e (cherry picked from commit a04963a6abdf34a49ecb815d97de394d8c7a152b)
2020-02-21Merge "CentOS 8: work around mod_ssl certificate issue" into stable/trainZuul1-0/+9
2020-02-20Merge "Refactor Apache httpd setup" into stable/trainZuul26-276/+61
2020-02-05Change fetch_fernet_tokens.py behaviour to check for minimum number of tokensMichal Nasiadka1-2/+2
Change is required to properly implement logic in fernet-node-sync.sh on kolla-ansible side - to add a check if fernet key store is populated with required number of tokens. Change-Id: I51ed61e34a1dd79532b4528e56a9cd9011d46e6d Related-Bug: #1846789 (cherry picked from commit 267cb8b14ae8472d00e09c2b5e35bda7de2de54f)
2020-01-31nova-libvirt: add UEFI packages to support UEFI instanceschenxing1-0/+30
Fix inability to run UEFI-based images/instances by installing UEFI packages also in nova-libvirt image which is not based on nova-base. Includes support for C8. Backport below Train w/o C8. Closes-Bug: #1814552 Co-authored-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Co-authored-by: Radosław Piliszek <radoslaw.piliszek@gmail.com> Change-Id: I1d5cd3d9af98444acac5bedd7daeaa6c6673dcd6 (cherry picked from commit 15b68c15c1dd0c2df1cc49b550f2fa03a4c65e8e)
2020-01-20Fixes swift-object-expirer for Debian and Ubuntu binary images.Dincer Celik1-1/+1
Replaces 'swift-object' package with 'swift-object-expirer' package. Change-Id: I8fa3fcad88b35743e042d8a62ccee722b08af673 Closes-Bug: #1859607 (cherry picked from commit 190a6f7a264c1ea8c0c565d2b75fb73fdc29d500)
2020-01-14CentOS 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 (cherry picked from commit 3590188383d8590a1e91573da656776563f65fcb)
2020-01-14Refactor Apache httpd setupMark Goddard26-276/+61
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 (cherry picked from commit 8484190e77e4237247dac7fba128e5a111fc9918)
2020-01-14Adapt fetch-fernet-tokens script to Python 3Michal Nasiadka1-1/+1
Backport: train Closes-Bug: #1859047 Change-Id: I9032e43bffa3a3de6c33a4ab59f65bafb0129dd5
2020-01-13Fixes rally db commandsDincer Celik1-1/+1
'rally-manage db' command was deprecated since 0.10.0 [1]. Should use 'rally db' instead. [1] https://rally.readthedocs.io/en/latest/project_info/release_notes/archive/v0.10.0.html#command-line-interface Closes-Bug: #1856693 Change-Id: I578f7a6d907d5579180bc64c99c7e6c8edf3afc8 (cherry picked from commit 1114859b5cb940290f405cd64e34c6638dcebcae)
2020-01-10neutron: fix build in stable branchesMarcin Juszkiewicz1-0/+1
When [1] was committed, neutron stopped building for Train. Analogous patch is proposed to other stable branches. This patch removes neutron from upper-constraints. Kolla master is affected directly because we build Train for CentOS 7 atm. 1. https://review.opendev.org/#/c/697370/ Change-Id: I944e8e42fef1d359d767cbc6e1c13371ed753f31