aboutsummaryrefslogtreecommitdiff
path: root/docker/openstack-base
AgeCommit message (Collapse)AuthorFilesLines
2021-01-25docker: do not install pip again in imagesMarcin Juszkiewicz1-1/+0
We install pip in base image so why repeat? Change-Id: Id903880b121d87d75b7b14084b0961b9ce99deba
2021-01-18openstack-base: move some packages from child imagesMarcin Juszkiewicz1-0/+13
automaton: cinder, glance, ironic, magnum, masakari, nova, octavia, watcher castellan: barbican, cinder, cyborg, glance, horizon, mistral, murano, nova, octavia, sahara, tacker click: blazar, cloudkitty, designate, ironic, keystone, kuryr, monasca, octavia, rally, sahara, zun httplib2: cinder, glance, horizon, monasca, neutron, solum, tacker, trove os-brick: cinder, freezer, glance, nova, zun os-traits: heat, ironic, kuryr, neutron, nova, octavia, placement, tacker, tempest, zun os-win: cinder, designate, freezer, glance, neutron, nova, zun oslo.privsep: ceilometer, cinder, cyborg, freezer, glance, masakari, neutron, nova, solum, tacker, zun oslo.reports: ceilometer, cinder, designate, glance, heat, magnum, manila, mistral, neutron, nova, octavia, panko, senlin, tacker, watcher, zaqar oslo.rootwrap: ceilometer, cinder, designate, glance, ironic, manila, neutron, nova, sahara, solum, tacker, zun oslo.upgradecheck: aodh, barbican, blazar, ceilometer, cinder, cloudkitty, cyborg, designate, freezer, glance, heat, horizon, ironic, keystone, kuryr, magnum, manila, masakari, mistral, monasca, murano, neutron, nova, octavia, placement, sahara, senlin, solum, tacker, trove, vitrage, watcher, zaqar, zun oslo.versionedobjects: barbican, cinder, cyborg, designate, heat, ironic, kuryr, magnum, masakari, mistral, neutron, nova, octavia, senlin, tacker, tempest, watcher, zun paramiko: ceilometer, cinder, freezer, manila, mistral, neutron, nova, rally, sahara, tacker, tempest, vmtp Change-Id: Ibb1e20a959a09f446752dbf1a54fb93df0892681
2020-12-11centos: do not enable PowerTools repo in baseMarcin Juszkiewicz1-0/+1
This repo is only needed for source openstack-base. Change-Id: I835c18424153f8529a37fc78e16d2becacb71263
2020-10-19Use upper constraints for virtualenv in openstack-baseMichal Nasiadka1-1/+1
Since Rally has virtualenv in requirements, and is using contraints - it's trying to downgrade virtualenv from inside a virtualenv. Let's try to install proper version of packages in openstack-base. Closes-Bug: #1900419 Change-Id: I2a1e2b6661fd4b62648756416e6147b604dda686
2020-09-21create 'add_binary_source_envs' macro and use itMarcin Juszkiewicz1-0/+1
There is small subset of images where we need to know which install_type or install_metatype is used. So add them only there (and their children). Change-Id: Ib7d5e36b958d6c8daf2989df32e29fa24b46c62a Implements: blueprint infra-images
2020-09-17Improve pip install process for offline deployment.Gaël THEROND (Fl1nt)1-4/+0
* "Use distribution-provided pip" * "Use python's pip module invocation method" * "Install pip earlier in order to avoid multiple installation" * "Remove pip_version variable requirement and call" Change-Id: Id0e738044a1931f9d611a7281a48ea4a593f1cf1 Closes-bug: #1893204
2020-08-11Remove weird depsRadosław Piliszek1-1/+0
This is a follow-up on "Refactor httpd install to base image" [1]. It seems a copy-paste algorithm was used to craft Dockerfiles for some httpd-enabled services which resulted in an abundance of ldappool packages getting installed, even in the 'source' case. This seems to have also kept ldappool at a lower version because it did not get updated via pip later. This patch deals with that and also moves ldap deps for Keystone to their proper place in 'source' case (extras). Note Keystone client gets installed in openstack-base. Cinder does not need to include Keystone either. [1] https://review.opendev.org/744037 Change-Id: I017d7a6a5d2b1ae6c04556dcf172453a36de5be7
2020-08-10Refactor httpd install to base imageJames Kirsch1-1/+18
Refactor installing and initial setup of httpd and mod wsgi from individual services to base image. Change-Id: I651a55a9ebe258ef403d33de010a4dfb368a4021
2020-07-09introduce 'infra_image_prefix' for infra imagesMarcin Juszkiewicz1-1/+1
Defaults to 'image_prefix' for now but shows which images gets their names changed soon. Change-Id: I0608e8f62f28d6667b4c8753c47553e4cbf75503
2020-06-19Remove the congress images since it has been retiredgugug1-3/+0
more info: https://review.opendev.org/#/c/721733/ Depends-On: I12d74b53b64268d0358220af35f7fd719d82b397 Depends-On: I21c9ab9820f78cf76adf11c5f0591c60f76372a8 Change-Id: I7bd03b4f70ddfb15c96ed68e659cb6dccb0c36a3 Co-Authored-By: jacky06 <zhang.min@99cloud.net>
2020-05-17CentOS: disable more reposMarcin Juszkiewicz1-0/+2
'messaging-rabbitmq' and 'opstools' are enabled by RDO delorean-deps.repo file 'influxdb' was also enabled Depends-On: https://review.opendev.org/728687 Change-Id: Ibb0a7edc9e5632c1b89a7d52601f55a223b49dfb
2020-04-15Remove support for CentOS 7Marcin Juszkiewicz1-104/+3
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-08openstack-base: PyNaCl needs 'make' to buildMarcin Juszkiewicz1-0/+1
INFO:kolla.common.utils.openstack-base: File "setup.py", line 159, in run INFO:kolla.common.utils.openstack-base: raise Exception("ERROR: The 'make' utility is missing from PATH") INFO:kolla.common.utils.openstack-base: Exception: ERROR: The 'make' utility is missing from PATH INFO:kolla.common.utils.openstack-base: ---------------------------------------- INFO:kolla.common.utils.openstack-base: INFO:kolla.common.utils.openstack-base: ERROR: Failed building wheel for PyNaCl Change-Id: Id8be6cc8f98207bc9ebf546c55d34cf9c6360cd7
2020-03-30Revert "openstack-base: pin setuptools < 46 to get horizon working"Marcin Juszkiewicz1-5/+0
pyScss 1.3.6 release has required fixes and horizon is using it. This reverts commit 5498671b344e48d6db865887537ff15cf4028510. Change-Id: I27bf14a8ff81086174eb0d55501039d4678b015e
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-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-01Add block labels to all DockerfilesChristian Berendt1-0/+2
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
2020-02-26Actually disable EPEL, and epel-modularMark Goddard1-1/+0
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-01-09CentOS 8: base and openstack-base imagesMark Goddard1-2/+9
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
2019-12-03Install etcd3gw to fix Ubuntu binary tooz coordinationRadosław Piliszek1-0/+1
Change-Id: Ib56e62d1fb4d0fc4a6c627b87a929be0bc614d1e Closes-bug: #1852086
2019-10-04Revert "Adding python*-pyngus package to openstack base"Mark Goddard1-2/+0
This partially reverts commit 73f9b5e47c7cab658ef75ac3dcdc2f006ebc7557. It was fixed in RDO on the packaging side: https://review.rdoproject.org/r/#/c/22745/ Ubuntu packages do not have a dependency on python3-pyngus, so that package has been left in place. Change-Id: Iea8fd1ac30400c67f76aec6d37ee7614f9c51770
2019-09-27Adding python*-pyngus package to openstack baseArx Cruz1-0/+3
This package is required by amqp on RHEL job scenario003 Change-Id: I7370c371c9f3f458e7f2b363d4341fbfbfe4fe89
2019-07-01Add python-sqlalchemy-collectd clientMike Bayer1-0/+2
sqlalchemy-collectd was added in I2bcaa44c184bb24e5caeeb8d204dda627de59c91, however it also must be installed alongside anywhere that python-sqlalchemy is installed since it provides an in-process plugin that transmits metrics to a remote collectd daemon. Also adds the python3 version of the package to the py3 version of the collecd/Dockerfile.j2. Note this is currently an *RPM only* package, and as of this commit is not yet availble for other packaging systems. Change-Id: If598da717653a383a2d3b3373c56517f8bca832f
2019-06-17openstack-base: add several popular python modulesMarcin Juszkiewicz1-0/+10
During building of all source images there are Python modules repeating in several targets. bcrypt: bifrost, ceilometer, cinder, dragonflow, freezer, keystone, manila, mistral, neutron, nova, rally, sahara, tacker, tempest, vmtp logutils: aodh, barbican, blazar, ceilometer, cloudkitty, designate, dragonflow, gnocchi, heat, ironic, kuryr, magnum, mistral, neutron, octavia, panko, qinling, solum, tacker, tempest, vitrage, watcher, zun pecan: aodh, barbican, blazar, ceilometer, cloudkitty, designate, dragonflow, gnocchi, heat, ironic, kuryr, magnum, mistral, neutron, octavia, panko, qinling, solum, tacker, tempest, vitrage, watcher, zun psutil: ceilometer, cinder, designate, dragonflow, freezer, heat, ironic, magnum, manila, mistral, monasca-agent, murano, neutron, nova, octavia, panko, searchlight, senlin, tacker, vitrage, watcher, zaqar, zun pymongo: almanach, aodh, freezer, horizon, monasca-agent, neutron-server-opendaylight, panko, vmtp, zaqar pyroute2: dragonflow, kuryr, mistral, neutron, nova, octavia, tacker setproctitle: aodh, ceilometer, cloudkitty, dragonflow, gnocchi, heat, kuryr, neutron, octavia, qinling, tacker, tempest, vitrage, zun simplegeneric: aodh, blazar, ceilometer, cloudkitty, glance, ironic, magnum, mistral, octavia, panko, qinling, searchlight, solum, watcher PyNaCl: bifrost, ceilometer, cinder, dragonflow, freezer, manila, mistral, neutron, nova, rally sahara, tacker, tempest, vmtp WSME: aodh, blazar, ceilometer, cloudkitty, glance, ironic, magnum, mistral, octavia, panko, qinling, searchlight, solum, watcher Change-Id: I3990254258289fae8fbaf505de0f8cdede435111
2019-06-07Merge "Debian/Ubuntu: more python3 packages for binary"Zuul1-31/+31
2019-06-06Debian/Ubuntu: more python3 packages for binaryMark Goddard1-31/+31
backport: Stein During the switch to Stein UCA, we did not switch all packages to python 3 for Debian/Ubuntu binary images. This change switches some more of those packages. Change-Id: I0bff21384d88ea678608392de2db1ba418c96665 Co-Authored-By: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
2019-06-06Debian/Ubuntu: move to Python 3 for source imagesMarcin Juszkiewicz1-3/+3
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-04-10Install "procps(-ng)" in the base imageCédric Jeanneret1-1/+0
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-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-20Merge "Do not explictly specify mysql related RPMS"Zuul1-2/+0
2019-03-15Merge "Move to Debian 'buster'"Zuul1-1/+1
2019-03-14Move to Debian 'buster'Marcin Juszkiewicz1-1/+1
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-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-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 python3 packages for RHEL systemsAlex Schultz1-4/+87
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-2/+8
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"Zuul1-3/+1
2019-03-11Introduce 'get_pip' macroMarcin Juszkiewicz1-3/+1
We have code for it in four places so it is a good candidate for macro. Change-Id: Icadcbbe5b386bdf688fd67e8160b40974f047377
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-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-02-28drop some of the xll related packagesJon Schlueter1-12/+0
these are containers, we should not have X11 display libraries installed in base containers. If they are being pulled in via packages those chains of dependencies should be looked at closely and pruned as they have no real use on container images. Change-Id: I19000564445254ba4d168f24deef6a901391d2e2
2019-02-25Merge "Simplify package list from openstack-base image"Zuul1-48/+0
2019-02-22Merge "debian/ubuntu: drop mysql compat stuff, unify on openssl 1.1"Zuul1-22/+2
2019-02-21Simplify package list from openstack-base imageMartin André1-48/+0
Remove the packages that are already pulled implicitly as a dependency. A shorter package list should make it more manageable. Change-Id: I690de645436065eee298a455221be8a6a0ae8083
2019-02-20pypi package msgpack-python is deprecated, drop explicit installJon Schlueter1-2/+0
according to https://pypi.org/project/msgpack-python/ it's deprecated and should use msgpack. and this is supported by looking at a build source container image and noting that pip lists msgpack 0.6.0 msgpack-python 0.5.6 also msgpack is pulled in via dependency of oslo.serialization We should be able to rely on it coming in via that dependency automaticly Change-Id: Id2706b3b38e57daf1166f98a59dc3ecd30fd4fa7
2019-02-19debian/ubuntu: drop mysql compat stuff, unify on openssl 1.1Marcin Juszkiewicz1-22/+2
Now with Ubuntu 'bionic' being used we can drop libmysqlclient-compat-dev package use and just go with mariadb packages directly. Also move to OpenSSL 1.1 for both distributions. Change-Id: I147385a3da15878121c0a436b5c26ba100e9802d
2019-02-01Drop python2-crypto as not needed in openstack-baseJon Schlueter1-1/+0
pycrypto has mostly replaced by python2-cryptography In patch I77b5210cd6e63aa3b01aa2b5b3372dd50009b9ad the source entries were all flipped to prefer cryptography instead of pycrypto, let's drop python2-crypto and let any remaining packages that do need it pull it in explicitly Change-Id: Ie0f426fbe396ed9b5a3b86406c64e12e87dd81a7
2019-01-31Merge "remove python-beaker from openstack-base rpm list"Zuul1-1/+0
2019-01-29remove python-beaker from openstack-base rpm listJon Schlueter1-1/+0
this package is a WSGI helper for caching, not in openstack requirements, and only referenced in refstack and airship. If it's used by any packages that I missed it should be implicitly installed where used/needed instead of in openstack-base and not used Change-Id: Iafd6678846e7c495cc96a6d3a7681d70a4bf8171
2019-01-29remove test dependencies from openstack-baseJon Schlueter1-4/+0
these containers should not need unittest support packages in general, tempest may need one of these but that should be installed as needed not for all container images. - testtools - introduced in - unittest2 - introduced in Ia3a9756c58f0ead3b20e435f1d1546408f4a8b36 - zake - introduced in Ie05ba975bc2f88cd9ee896aafc60171d6ca8d10b - fixtures - introduced in Ia3a9756c58f0ead3b20e435f1d1546408f4a8b36 Change-Id: Ic2325afc6ce3ee9f8a8c03ad19050809255df2f5