summaryrefslogtreecommitdiff
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2020-01-14Merge "Adds monasca-ui to horizon"Zuul1-0/+10
2020-01-14Upgrade Kafka to 2.0.1 releaseDoug Szumski1-2/+2
We upgrade to 2.0.1 and not a newer version because Monasca currently supports 2.0.1. This also brings the Kafka release inline with the current Zookeeper version for the 5.0.x Confluent platform [1]. [1] https://docs.confluent.io/current/installation/versions-interoperability.html Change-Id: I835d10bfe3ac0ea7382387a27b222849afb84aa3
2020-01-14Merge "base: use install_packages() macro to install packages"Zuul1-6/+2
2020-01-14Merge "Ubuntu: use local APT mirrors if possible"Zuul1-3/+3
2020-01-14Merge "Adapt fetch-fernet-tokens script to Python 3"Zuul1-1/+1
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-13Adapt fetch-fernet-tokens script to Python 3Michal Nasiadka1-1/+1
Backport: train Closes-Bug: #1859047 Change-Id: I9032e43bffa3a3de6c33a4ab59f65bafb0129dd5
2020-01-13Merge "Fixes rally db commands"Zuul1-1/+1
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-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
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-10Merge "Remove tgtd and scsi-target-utils support in CentOS/RHEL 8"Zuul3-4/+12
2020-01-10base/ubuntu: use 'ussuri' packages from UCAMarcin Juszkiewicz3-3/+3
Change-Id: Ia977d60e170efc1d4567bcea7f318b9d87233458
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
2020-01-09CentOS 8: base and openstack-base imagesMark Goddard4-33/+124
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 Kucia3-4/+12
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-08Merge "Add OVN bits to neutron-base"Zuul2-3/+7
2020-01-08Add OVN bits to neutron-baseMichal Nasiadka2-3/+7
Currently neutron-server-ovn container does not run db setup for networking-ovn subproject when bootstrapping - since it uses extend_start from neutron-server (where networking-ovn is not installed). Since OVN is being added as in-tree driver to Neutron and there is no rationale behind supporting separate container images for neutron-server-ovn and neutron-metadata-agent-ovn, hile networking-ovn driver uses around 1-2MB of space - this change adds networking-ovn installation to neutron-base image and deprecates neutron-server-ovn and neutron-metadata-agent-ovn images. Change-Id: Ib2dbdd7e7d34f56985b7a5b2494c3b89034688cb
2020-01-07horizon: fix build in stable branchesMarcin Juszkiewicz1-0/+2
When [1] was committed, horizon stopped building for Train. Analogous patch is proposed to other stable branches. This patch removes horizon from upper-constraints. Kolla master is affected directly because we build Train for CentOS 7 atm. [1] https://opendev.org/openstack/requirements/commit/3e54878f9c87266e1b9775f72af06de27a3dad65 Co-authored-by: Radosław Piliszek <radoslaw.piliszek@gmail.com> Change-Id: I1bd5a40eeef9612d995c81426fe510e89f438725
2020-01-04Adds monasca-ui to horizonHamed Bahadorzadeh1-0/+10
'config_monasca_dashboard' method added and called so if 'ENABLE_MONASCA' is set this merhod will add monasca-ui to horizon. Change-Id: If46d0d629a678f9878f36f1cfbe31153ab5ebf9b Implements: blueprint monasca-ui Signed-off-by: Hamed Bahadorzadeh <h.bahadorzadeh@gmail.com>
2020-01-03Merge "CentOS 8: work around mod_ssl certificate issue"Zuul1-0/+9
2020-01-02centos: disable EPEL by defaultMarcin Juszkiewicz4-6/+9
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-21vitrage-base: honor distro_python_versionMarcin Juszkiewicz1-1/+1
Change-Id: I27c71c1237dc010531495440e6094d8b129f6c48
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 Juszkiewicz3-13/+13
Whitespaces suxx ;D Change-Id: I4bfd437c914680a5dcbc67dfe9b0a9a74e2eb35d
2019-12-17Fix monasca-grafana being unbuildable due to old npmRadosław Piliszek1-1/+6
Affected builds on Ubuntu which had: npm 3.5.2 while the latest was: npm 6.13.4 And CentOS had: npm 5.6.0 This patch runs npm update via npm. Pinned to 6.x. Additionally, this moves npm packages prefix (root) to /usr/local to avoid conflicts with native packages. Change-Id: Ibaacc1cc478b2b2f8196a5da4eea3570d7d310ff Closes-bug: #1856699
2019-12-16Merge "base: unify CentOS packages list"Zuul1-30/+9
2019-12-16Merge "Refactor Apache httpd setup"Zuul26-276/+61
2019-12-13Merge "Use APT pinning to set preferred version of RabbitMQ"Zuul3-21/+7
2019-12-13Merge "Add Networking-MLNX to Neutron-Base packages"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"Zuul8-0/+88
2019-12-12Use APT pinning to set preferred version of RabbitMQMarcin Juszkiewicz3-21/+7
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-12Add Networking-MLNX to Neutron-Base packagesHamdy Khader1-0/+3
The package is required for infiniband deployment to be installed on containers: neutron-server, neutron-dhcp-agent and neutron-l3-agent. Change-Id: I017b65c2032648fa0ac7126d4a06cd98cb7c33a0
2019-12-11Refactor 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
2019-12-10Merge "Revert "Introduce macro to remove Py3 only plugins on CentOS 7""Zuul3-12/+2
2019-12-10Merge "Remove kolla_keystone_* modules from kolla-toolbox"Zuul3-197/+1
2019-12-09Merge "base: use upstream dumb-init on all architectures"Zuul1-24/+0
2019-12-09Merge "Let nova-libvirt restarting be independent of libvirtd.log"Zuul1-1/+1
2019-12-09Merge "Fix keystone bootstrap error message display"Zuul1-1/+5
2019-12-09Merge "sensu-client: use docker.io on Debian/Ubuntu"Zuul2-12/+1
2019-12-09Build images with healthcheck scripts for core servicesMichal Nasiadka8-0/+88
blueprint container-health-check Now docker supports healthcheck directive[0] in Dockerfile, which is helpful for checking container aliveness. Base for this patch were healthcheck scripts from tripleo[1]. [0] https://docs.docker.com/engine/reference/builder/#healthcheck [1] https://github.com/openstack/tripleo-common/tree/master/healthcheck Change-Id: Ifc32713cd4d6b45c74855c0ebf5bb65784701d44
2019-12-09Remove kolla_keystone_* modules from kolla-toolboxMark Goddard3-197/+1
These are no longer used by kolla ansible, and were not used by any other deployment tools. Change-Id: I214b0b7d94717aa9aeae88363d5721396e7b6684
2019-12-09Fix keystone bootstrap error message displayMark Goddard1-1/+5
In some situations, Keystone bootstrap can fail, and then unhelpfully fails displaying the error message output by the 'keystone-manage bootstrap' command. This appears to be due to unprintable control characters in the error message which prevent the output of the script from being valid JSON. This change fixes the issue by piping the output through 'cat -v', which replaces unprintable characters with control codes. Change-Id: I82444bc2272311023cc9e92c5a298d1c4c87483b Closes-Bug: #1855701
2019-12-09base: use upstream dumb-init on all architecturesMarcin Juszkiewicz1-24/+0
In past we were building 'dumb-init' from source. Then in commit f8fd56056114af7e2c8b8185cd258c6fd3993c8c we moved to using binaries from Debian packages instead. With keeping compiler... Now Travis CI supports all architectures we care about. So dumb-init upstream built all binaries for us. Good bye compiler stuff. 115 megabytes saved. Change-Id: I08e0e564908e6abb279a73f08cad4c851395ca47
2019-12-06Merge "Vitrage: build images for Debian"Zuul5-0/+57