summaryrefslogtreecommitdiff
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2019-03-23MariaDB upgrade: specify host and portMark Goddard1-1/+1
While mysql_upgrade seems to work on CentOS images without specifying a host and port, it fails on Ubuntu without these. Change-Id: Ie140de57c4fe2f2e4db6a90c18e3535d9cc71ff2 Related-Bug: #1820325
2019-03-22Merge "Move top package installed in every *-base container to openstack-base"Zuul1-0/+2
2019-03-22Bump skydive version to 0.22.0Michal Nasiadka1-1/+1
Change-Id: Ic88ab9fabcfd0287d41e13606aba1290f6f7a011 Closes-Bug: #1806167
2019-03-21cleanup in base for yum install entriesJon Schlueter2-16/+11
- introduce install_packages(..., chain=True) to allow chaining on onto existing RUN commands - introduce install_packages(..., clean) which defaults correctly but allows you to override if you want to avoid doing extra package manager cleanup - refactored several calls in base to make use of these new features In general this allows for macros.install_packages to be chained after other calls for example RUN foo && {{ macros.install_packages(..., chain=True) }} Change-Id: I4b2fe8e13ee3c0fffe77a1179a7af5b534496996
2019-03-21Fixup whitespace issue in chainingJon Schlueter1-2/+2
base_rhel_package_installation block had whitespace isses depending on which branch of the if statement you had. this resulted in a blank line in the continued "\ \n &&" rendered Dockerfile Change-Id: I634f1bc01806e2606d611b3697e84b43278c4a9b
2019-03-21refactor to pull out rpm_security_update macroJon Schlueter2-11/+12
- pulled out the repeated code from 3 paths in base and moved it into docker/macros - created macros.rpm_security_update - made sure the new macro could be customized for cleanup caches - update macro to use distro_package_manager Change-Id: Ic79ff42d913e1cbb68be66743e4f79f0bcff47f5
2019-03-21Merge "Fix MariaDB 10.3 upgrade"Zuul2-1/+26
2019-03-21Merge "monasca, tempest: install librdkafka-dev to get it built for ↵Zuul2-0/+8
non-x86/source"
2019-03-21Move top package installed in every *-base container to openstack-baseJon Schlueter1-0/+2
- python*-oslo-upgradecheck was being installed in a number of different *-base containers that I checked Change-Id: Iddd8a191e5523ec048dff324993abadcfc020132
2019-03-21Merge "Use virtual package for ansible"Zuul1-2/+2
2019-03-21Merge "Install qemu-system in nova-libvirt on ubuntu"Zuul1-1/+1
2019-03-21Merge "Introduce clean_package_cache"Zuul2-8/+10
2019-03-21Merge "install ncurses explicitly for tput for rpm distro"Zuul1-0/+2
2019-03-20Merge "Drop redundant rpms from nova-base package list"Zuul1-12/+0
2019-03-20Merge "Do not explictly specify mysql related RPMS"Zuul1-2/+0
2019-03-20Merge "Add Google mtail for generating metrics from logs"Zuul1-0/+30
2019-03-20install ncurses explicitly for tput for rpm distroJon Schlueter1-0/+2
tput is used in PS1 env, but nothing explicitly makes sure that it is installed. Red Hat's ubi8 base image only contains ncurses-base and ncurses-libs but not ncurses rpm which provides the tput cli Change-Id: I4f6b101195d245e14f6600b1edd9caafd25dcaac
2019-03-20monasca, tempest: install librdkafka-dev to get it built for non-x86/sourceMarcin Juszkiewicz2-0/+8
fixes build issue under Debian:buster on AArch64: In file included from confluent_kafka/src/confluent_kafka.c:17: confluent_kafka/src/confluent_kafka.h:22:10: fatal error: librdkafka/rdkafka.h: No such file or directory #include <librdkafka/rdkafka.h> ^~~~~~~~~~~~~~~~~~~~~~ compilation terminated. error: command 'aarch64-linux-gnu-gcc' failed with exit status 1 Under Ubuntu it is still broken because librdkafka is too old. Change-Id: I1e54645ea5805f985c9bd04f9936ea3edbebfd31
2019-03-18Sahara: install also the split pluginsLuigi Toscano1-0/+26
The code of Sahara plugins has been extracted during the Stein cycle. Add support for: - the source-based deployment method (a beta release of the plugins is available on pypi) and - the RPM-based method (RDO contains the packages for the plugins.) This change is required also for the RPM method. Even if the RPM packages of the plugins are linked through weak dependencies to the sahara-api and sahara-engine packages (Supplements), weak dependencies are currently disabled here. Change-Id: I5241d84aa1ca2830cfdb60c1a3ff4e958a21b345
2019-03-18Fix MariaDB 10.3 upgradeMark Goddard2-1/+26
There are a couple of issues with the mariadb image currently. 1. it doesn't include mysql_upgrade on CentOS/RHEL. It is necessary to run this after an upgrade of MariaDB. This is fixed by installing mariadb-server-utils. 2. it inherits the standard dumb-init entrypoint from the base image, which includes a --single-child argument. That causes signals to be forwarded only to the process executed by dumb-init, which in the case of kolla-ansible is mysqld_safe, however mysqld_safe ignores SIGTERM. After a timeout, Docker then forcibly kills the container. Executing dumb-init without --single-child ensures the TERM signal is sent to mysqld, allowing it to shutdown gracefully. Change-Id: I1a450736721863b91be1ea3d3c8948990de9fdeb Closes-Bug: #1820325
2019-03-18Pin sensu mailer and slack pluginsMark Goddard1-2/+5
The 4.0.0 release of the mailer plugin requires Ruby 2.3+, which is not avaiable in CentOS/RHEL7. Pin it to the 3.0.0 release, which is supported. While we're here, also pin the slack plugin. Both use the pessimistic version operator, as used in the sensu-client image. Change-Id: Idac8cb696c81c7413a3da79b4868f556ef36fc8d Closes-Bug: #1820594
2019-03-17Introduce clean_package_cacheEmilien Macchi2-8/+10
Default to true (to maintain backward compatibility), this parameter will allow to disable the Package cache cleaning when building the Kolla images. In TripleO, we are investigating how we can accelerate the builds by not cleaning the Yum cache and this patch will help us to do so. Also included same for deb package_install method. Co-Authored-By: Jon Schlueter <jschluet@redhat.com> Change-Id: I0adc85302dfe0411d362c899f3e0d6a0019680d4
2019-03-15Merge "Move to Debian 'buster'"Zuul7-33/+6
2019-03-15Merge "helm-repository: drop unused os_client_config variable"Zuul1-6/+0
2019-03-15Merge "base: more strict pin of Ceph/Luminous for Ubuntu"Zuul1-1/+1
2019-03-15Merge "Drop tcp_wrappers package requirement"Zuul1-2/+1
2019-03-15Merge "Separate placement DB sync and data migrations"Zuul1-0/+12
2019-03-15Install qemu-system in nova-libvirt on ubuntuMark Goddard1-1/+1
In https://review.openstack.org/643308 we installed only the x86 qemu emulator due to an issue in nova when installing all emulators via qemu-system. The nova issue should be fixed by https://review.openstack.org/643458, at which point it should be safe to merge this patch. Depends-On: https://review.openstack.org/643458 Change-Id: I1c045d85a8473725baf907d7c6ecb780b8f6748d
2019-03-15Fix lower-constraints and kolla CI jobsMark Goddard4-7/+7
Multiple fixes to fix multiple problems. 1. Bump setuptools requirement to 21.0.0 The 16.0.0 requirement breaks the lower-constraints job on Ubuntu bionic. We see the following error: AttributeError: module 'importlib._bootstrap' has no attribute 'SourceFileLoader' 2. ubuntu-binary horizon image needs to use python3 for django manage.py 3. ubuntu-binary nova-placement-api image needs to use python3 for apache mod wsgi. 4. nova-libvirt needs exact qemu dependencies due to packaging change 5. OracleLinux repos definition was changed in official image. 6. Fetch InfluxDB gpg key for Ubuntu base image from influx server. Change-Id: Ic797d41f53a5f146d112619f1683cbfbf3a85dc2
2019-03-14Move to Debian 'buster'Marcin Juszkiewicz7-33/+6
Buster is at freeze phase so safe to update and use. Will give us Python 3 based OpenStack packages (usually release delayed). Change-Id: I48c2d252a834716f1bcf10b18f2d32fe541e8137
2019-03-13Drop redundant rpms from nova-base package listJon Schlueter1-12/+0
- openstack-base explictly pulls in python[3]-keystoneclient - openstack-base pulls in python[3]-openstackclient which pulls in python[3]-cinderclient This simplifies the python2/3 cases, and reduces how many times these 2 packages are installed Change-Id: If8eb4dc1c5d5de88a8d9b59920b01d09cb585ebb
2019-03-13Merge "Fix the permission issue of placement-api log"Zuul1-0/+3
2019-03-13base: more strict pin of Ceph/Luminous for UbuntuMarcin Juszkiewicz1-1/+1
Change-Id: I5edc46c3b93f93bdb7fa97b08072a773b8296e02
2019-03-13Do not explictly specify mysql related RPMSJon Schlueter1-2/+0
These should be pulled in via oslo-db or other rpms that use them. Change-Id: Ie048053b23f02d324552a72aabbef96671eb37c1
2019-03-13Use virtual package for ansibleAlex Schultz1-2/+2
Rather than specify ansible-python3 or ansible, we can try the virtual package for the python specific version of ansible. Change-Id: I246edfaf8cc0ee12852c18c6f9027e48880797a4
2019-03-13Merge "Copy placement database migration script"Zuul2-4/+27
2019-03-13Separate placement DB sync and data migrationsMark Goddard1-0/+12
For an online upgrade, these commands should be executed separately. Change-Id: I8d40a4d66c18022e73b48ecdfd299d9ed459777f
2019-03-13Fix the permission issue of placement-api logchenxing1-0/+3
This patch is committed according to patch[0] of the kolla-ansible. [0]https://review.openstack.org/#/c/613629/28 Change-Id: Id138802b320ae0a0f01db51a0b5a784c83a72485
2019-03-13Drop tcp_wrappers package requirementBernard Cafarelli1-2/+1
Originally added in [1] when improving the base image, nothing appears to require this package currently. Also, this legacy package is not maintained and has been dropped from Fedora (and upcoming RHEL 8) [2] [1] https://review.openstack.org/#/c/295048/ [2] https://fedoraproject.org//wiki/Changes/Deprecate_TCP_wrappers Change-Id: I2983932898f877da2e31a5a968f6c91e5a9d760b
2019-03-12Add distro_package_manager configurationAlex Schultz4-2/+20
Add configuration to allow the switch between dnf/yum or provide an alternative package manager. Change-Id: I913769fcf5875a12b4561958cf7c90b74cd116ea
2019-03-12Add python3 packages for RHEL systemsAlex Schultz56-113/+748
RDO is currently working on python3 support for the next version of CentOS/RHEL based systems. This package uses the distro_python3 flag that was added as part of I4028991bad92c0e8e21066cc4173c06ce5eba393 to use the python3 specific package names. This change only adds python3 package names for RHEL systems. Conflicts-With: https://review.openstack.org/#/c/636457/ Change-Id: Iad6b70b433a0dd1b0f8ae6790fd280594517661a Related-Blueprint: python3-support
2019-03-12replace 'distro_python3' variable with 'distro_python_version'Marcin Juszkiewicz6-10/+22
RHEL7 derived distros use Python 2.7 RHEL8 uses Python 3.6 Ubuntu 18.04 uses Python 3.6, but we haven't enabled it yet. Debian:buster uses Python 3.7, but we haven't enabled it yet. We have several places in code where "/lib/pythonX.Y/site-packages" is used so we need to know value of X.Y rather than py2/py3 switch. How to check for Python 2: {% if distro_python_version == '2.7' %} Breaks: Iad6b70b433a0dd1b0f8ae6790fd280594517661a Change-Id: Ie24f109af19ae0438c21e0d43cb3cc947812b4ce
2019-03-12Merge "Introduce 'get_pip' macro"Zuul5-12/+10
2019-03-11Introduce 'get_pip' macroMarcin Juszkiewicz5-12/+10
We have code for it in four places so it is a good candidate for macro. Change-Id: Icadcbbe5b386bdf688fd67e8160b40974f047377
2019-03-11[docker/prometheus] Bump openstack-exporter version.Jorge Niedbalski1-1/+1
This commit bumps the prometheus-openstack-exporter version to the latest release 0.0.7. Change-Id: I4244f15d4eae4bc670cb2158ecf072781fd4c2ac Signed-off-by: Jorge Niedbalski <jorge.niedbalski@linaro.org>
2019-03-11Drop python2-pika_pool rpmJon Schlueter1-1/+0
As a follow up to I7204aab66a252e0fdc3c0eebf5232903340a7e5d also drop the rpm for pika_pool Change-Id: I3db311cfa5310d26b672b17928cdbd72ea655f8b
2019-03-11helm-repository: drop unused os_client_config variableMarcin Juszkiewicz1-6/+0
Change-Id: I3694ba72733cb5cb391af62b609272cb4461431f
2019-03-11Merge "openstack-base: drop pika-pool"Zuul1-1/+0
2019-03-08openstack-base: drop pika-poolMarcin Juszkiewicz1-1/+0
Last release of pika-pool was in 2015 and targetted pika 0.10 release: INFO:kolla.common.utils.openstack-base:pika-pool 0.1.3 has requirement pika<0.11,>=0.9, but you'll have pika 0.13.0 which is incompatible. None of our images requires pika-pool (tested by dropping it and then building all images). Change-Id: I7204aab66a252e0fdc3c0eebf5232903340a7e5d
2019-03-08Copy placement database migration scriptEduardo Gonzalez2-4/+27
mysql-migrate-db.sh script is not bundled in packages nor installed with pip. So will need to copy over some path in the host to run the db migration. Change-Id: I116277c5e11b484748784134be50c18675b28103