aboutsummaryrefslogtreecommitdiff
path: root/docker/base
AgeCommit message (Collapse)AuthorFilesLines
2019-06-26Move back to CentOS StorageSIG repos for Ceph and GaneshaGiulio Fidente2-23/+4
Recently a new repo was created in CentOS to distribute Ganesha, and the repo made a dependency of the Ceph Nautilus repo package [1] When centos-release-ceph-nautilus 1.2-1 will go out, it should not be necessary to disable the CentOS Ceph repos pulled in by dependency of the RDO repositories, as done in [2] 1. https://github.com/CentOS-Storage-SIG/centos-release-ceph/commit/f1a17c9d145cabfa1dfd3102fe7e2fc584f6a907 2. https://review.opendev.org/#/c/651601/ Change-Id: I6bf0cbfaffc22147c5bec03b5897719de53366ed
2019-06-26base: do not put grafana repo twiceMarcin Juszkiewicz1-2/+0
By mistake I added it second time in 1e7a78932dc0461c60d9fd6e613b252d8b22ff01 commit. Change-Id: I78e9574ea01d84051dbc649fea1b5b9556778a15
2019-06-24Merge "Add a variable to configure repos disabled in base CentOS image"Zuul1-6/+11
2019-06-18Merge "Remove crane image"Zuul2-8/+0
2019-06-18ubuntu: use UCA/trainMarcin Juszkiewicz3-3/+3
Change-Id: If75db0f9fc1bfe82a4ace2cd5bfe603cfe5a5396
2019-06-18Add a variable to configure repos disabled in base CentOS imageRadosław Piliszek1-6/+11
[1] disabled CentOS Ceph Nautilus repo for Stein. It turned out to be a problem for TripleO ([2]) which does not use upstream Ceph repo and actually relies on CentOS Ceph Nautilus repo. We did not leave the option to override our customization. This patch adds a customizable variable to base CentOS image: centos_yum_repos_to_disable [1] https://review.opendev.org/651601 [2] https://review.opendev.org/664244 Change-Id: I867ca75cafe853b206beae2f81dfb79b62d05557 Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
2019-06-17base: do not use non-free repositories for UbuntuMarcin Juszkiewicz3-12/+12
Remove restricted and multiverse from ubuntu. restricted is supported software that is non-free. multiverse is unsupported software that is non-free. We should not use any of them. And they are not mirrored by OpenStack infra. Change-Id: I34b9d56559eada96abec13814a2aa91b57055710
2019-06-17Merge "grafana/aarch64: use package from upstream repositories"Zuul3-0/+11
2019-06-10Merge "Fix issues with Percona in Zuul and clean up a little bit"Zuul6-96/+8
2019-06-08Fix issues with Percona in Zuul and clean up a little bitRadosław Piliszek6-96/+8
Percona site has connectivity issues from OVH hosts (of Zuul). This patch makes it so that: - the internal repo is actually used - RPM GPG keys are downloaded from the actually used repo - Ubuntu mimics the RHEL behavior (i.e. the Percona repo is enabled only in the xtrabackup image) extra benefit: no need for APT preferences for Percona repo to spare MariaDB deps Change-Id: Id27831f6b404762f9e44fd6bd1c4702bf06b05f8 Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
2019-06-07grafana/aarch64: use package from upstream repositoriesMarcin Juszkiewicz3-0/+11
We were installing 5.2.4 version instead of just latest one like it is done on x86-64. Change-Id: If8434c6c05e415ac8d601260d02b25facbdef1f5
2019-06-07Merge "Use packagecloud/ubuntu rabbitmq repo for all archs"Zuul2-0/+6
2019-06-07Remove crane imageMark Goddard2-8/+0
This image was deprecated in the Stein cycle. Change-Id: I249b78cd263c97c4a9223523c77f8c325f3e649a
2019-06-06Debian/Ubuntu: move to Python 3 for source imagesMarcin Juszkiewicz1-12/+18
Commit 43b74ccc157c0b50138c3785ed91dab504895571 enabled use of Python 3 based packages but not switched to use Python 3. Some of images still contain Python 2. There are two reasons: - Ceph (ceph-common depends on Py2) - python3-ldappool on Ubuntu 18.04 In Ceph situation Py3 packages were added. For second one we can not do anything - Py2 dependency got dropped in Ubuntu 18.10 version. Removed neutron-server-plugin-networking-infoblox due to being not maintained. Once https://review.opendev.org/#/c/657578/ get merged someone may revert that part. Implements: blueprint debian-ubuntu-python3 Depends-on: Ie2a1077f7def0743f1403341985e2109aa490026 Change-Id: Ibfe0c2b8be98db56c61f74fb0247488ab3749ef4
2019-06-05Use packagecloud/ubuntu rabbitmq repo for all archsMarcin Juszkiewicz2-0/+6
Change-Id: I880a33b56a2fe9b86de57326c80310a6a83c5e50
2019-05-31Ceph: Update to Nautilus on CentOS and OracleLinuxMark Goddard2-4/+26
The CentOS Stein OpenStack distribution depends on the Ceph Nautilus release, while Kolla currently deploys Luminous on CentOS. This change switches CentOS and OracleLinux builds to use Ceph Nautilus. Support for auth UID has been removed in the Nautilus release [1][2], so we have removed the --set-uid argument from calls to ceph-authtool. Also ceph-osd bootstrap mode fails when no mon config is provided, so we added --no-mon-config (mon config is injected later after bootstrap). Due to ceph-nfs build issues (ceph upstream nfs-ganesha rpms relied on older version of userspace-rcu, than CentOS Storage SIG packages) we need to move to ceph upstream rpm repos. [1] https://github.com/ceph/ceph/commit/d6def8ba1126209f8dcb40e296977dc2b09a376e [2] http://docs.ceph.com/docs/master/releases/nautilus/ Co-Authored-By: Michal Nasiadka <michal.nasiadka@nokia.com> Change-Id: I000398f587c5f4d6cc8995e34e162eebc77bc3e3 Implements: blueprint centos-ceph-nautilus
2019-05-28Merge "Install fluentd gem on debian/ubuntu for non x86_64"Zuul1-1/+3
2019-05-01Drop systemd support from PAMCédric Jeanneret1-0/+4
The line being removed is the cause of audit.log spam with a SELinux enforcing (and permissive) system. They are due to the fact we're calling "sudo" from within some containers, and PAM wants to connect to the host "dbus" socket (mounted in /run). This action is obviously denied by SELinux. The "-" prefix makes this module optional anyway, but apparently PAM does see it and tries to use it. Dropping this module has no consequences other than preventing log spamming. Change-Id: I3e0e86026f5a4a78473bed824cd1682d3a020cd5 Co-Authored-By: Michele Baldessari <mbaldess@redhat.com> Resolves-Bug: #1819461
2019-04-13Merge "Add config option use_dumb_init to add it to container images"Zuul1-2/+4
2019-04-10Install "procps(-ng)" in the base imageCédric Jeanneret1-0/+3
Providing tools like "ps", "pgrep" and related is interesting since it helps debugging a container in some cases. It is also useful for healthchecks in case we want to fetch running service PID and use it in another command, like "lsof". Change-Id: I91b1c407caa6b03ae522e649592300f9eddfc07e
2019-04-03Add config option use_dumb_init to add it to container imagesRabi Mishra1-2/+4
Usage of dumb-init can also be disabled from cli with `--nouse-dumb-init` when building images. Also moves ENTRYPOINT outside of dumb_init_installation block. Change-Id: Id32d54fc9913b83cf121ede5a5e265e0772062ae Related-Bug: #1821970
2019-03-28Install fluentd gem on debian/ubuntu for non x86_64Pedro Alvarez1-1/+3
The package used to install fluentd on debian/ubuntu is not available for architectures other than x86_64. For those cases install fluentd as a gem until the package 'td-agent' is available for more architectures. Change-Id: Ic1b25b37d06b429a112f1418a79d385d505bb1e9
2019-03-21cleanup in base for yum install entriesJon Schlueter1-10/+4
- 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 Schlueter1-11/+4
- 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 "Introduce clean_package_cache"Zuul1-6/+6
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-17Introduce clean_package_cacheEmilien Macchi1-6/+6
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'"Zuul2-15/+3
2019-03-15Merge "base: more strict pin of Ceph/Luminous for Ubuntu"Zuul1-1/+1
2019-03-15Fix lower-constraints and kolla CI jobsMark Goddard1-3/+2
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 Juszkiewicz2-15/+3
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-13base: more strict pin of Ceph/Luminous for UbuntuMarcin Juszkiewicz1-1/+1
Change-Id: I5edc46c3b93f93bdb7fa97b08072a773b8296e02
2019-03-12Add distro_package_manager configurationAlex Schultz2-1/+17
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 Schultz1-1/+11
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 Juszkiewicz1-1/+2
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-02-28debian/ubuntu: make use of Python3 based packagesMarcin Juszkiewicz3-3/+3
Both Ubuntu Stein UCA and Debian 'buster' migrated their OpenStack packages to Python 3. Note that Debian 'buster' is not released yet and contains Rocky packages. Stein ones will be available later. Co-Authored-By: Lee Yarwood <lyarwood@redhat.com> Co-Authored-By: Eduardo Gonzalez <dabarren@gmail.com> Change-Id: I160f79cc57f54ec3eac857c5babd1a6e2656d228
2019-02-25Merge "base: update to dumb-init 1.2.2"Zuul1-6/+9
2019-02-25base: update to dumb-init 1.2.2Marcin Juszkiewicz1-6/+9
This version allows us to use Debian binaries for non-x86 architectures instead of building 'dumb-init'. 'base_compiler_packages' are installed as they will be needed anyway to build other Python packages (no binary wheels for !x86). We also need 'binutils' to be installed for 'ar' command. Change-Id: I53ad946ead4f0b485d8c7e8a91ac2ef5d7735c5a
2019-02-22Change some repos from xenial to bionicMichal Nasiadka1-3/+3
At the time of bumping Ubuntu images to bionic, some repos did not have bionic versions - so xenial repos were used. Most of the repos - apart odl now have a bionic tree - so this patch enables them. Change-Id: Id3c67fad507adc7b9f200eced74ecba8fadf70e6
2019-01-30Fix broken xtrabackup and monasca-grafana imagesMartin André3-2/+85
Percona started signing packages with a new public GPG key, without providing it via HTTPS. Ship the PERCONA-PACKAGING-KEY extracted from the percona-release package. https://jira.percona.com/browse/PT-1685 monasca-grafana broken by 'rake' missing when trying to install the 'fpm' gem. Co-Authored-By: Mark Goddard <mark@stackhpc.com> Change-Id: Ica9867448dc20864f2fd4614a295a23a4a625af4 Closes-Bug: #1813906 Closes-Bug: #1813927
2019-01-23Guard adding contentdir RUN in base templateJon Schlueter1-1/+1
As a follow up to I402cff1ac86a2ba108f2f5378cc98db5f6ecc673 only add the echo command if there is a value in centos_contentdir Change-Id: Ie5144ee3b8bdb2535a32cfb43c43dfc1bb556ac8
2019-01-18Merge "Use base_package_type"Zuul1-5/+5
2019-01-18Make set_config.py compatible with both Py2 and Py3Damien Ciabrini1-1/+1
When asserting the validity of config files, we currently use viewkeys(), which has been removed in Python3, so a kolla container cannot set the config with Python3 only. "Traceback (most recent call last):", " File \"/usr/local/bin/kolla_set_configs\", line 406, in main", " config = load_config()", " File \"/usr/local/bin/kolla_set_configs\", line 297, in load_config", " validate_config(config)", " File \"/usr/local/bin/kolla_set_configs\", line 238, in validate_config", " if not data.viewkeys() >= required_keys:", "AttributeError: 'dict' object has no attribute 'viewkeys'" Use keys() instead, which is compatible with both Python2 and Python3, and has no visible performance disadvantage and wrap it in a set() call so that we are guranteed to compare sets. Change-Id: I5f53c8f5a390a9df3ebb60659ebdcef41e3a9cad Co-Authored-By: Michele Baldessari <michele@acksyn.org>
2019-01-17Use base_package_typeAlex Schultz1-5/+5
This change updates the docker files to use base_package_type instead of doing specific distro checks for the rhel/deb generic cases. The base_distro is still available and is used when a specific distro needs a customization but if the differences are purely rpm vs deb, then the base_package_type can be used. Change-Id: I8d720bb185df65a0178061ccf20b1ab2265da2c5
2019-01-15Ensure /run_command is readable by all usersDamien Ciabrini1-1/+7
On some distro, running kolla_start via su changes the default UMASK, and consequently set_configs.py generates a /run_command that is not world-readable, and kolla cannot start the configured service. Make sure /run_command always has 'go+r' permissions. Change-Id: I6304f5937c512068ee1fb8aac5c88a2bd086e387
2019-01-09Fix grafana repoJeffrey Zhang4-9/+10
Grafana repository is moved from packagecloud to packages.grafana.com[0]. Based on new grafana install guide[1], update the grafana.repo [0] https://grafana.com/blog/2019/01/05/moving-to-packages.grafana.com/ [1] http://docs.grafana.org/installation/rpm/#install-via-yum-repository Closes-Bug: #1810867 Change-Id: Ib065fdc561b72fc013b952b3df41ee83b083194e
2018-12-19Merge "Use infra mirrors for ODL and percona repos"Zuul1-2/+2
2018-12-18Merge "base/debian: add Percona repo key"Zuul1-0/+1
2018-12-18Use infra mirrors for ODL and percona reposEduardo Gonzalez1-2/+2
Change-Id: I212a53b235f2785d93d474660c87a8521f3cc8b2
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-06 13:49:17 +0000