Commit Graph

179 Commits

Author SHA1 Message Date
Michal Nasiadka e47e24c946 Drop Vitrage
It has been deprecated in Antelope cycle.

Change-Id: Ie9cc529d186b74ea3d07b0082f9c965d4aa054e9
2024-04-24 17:55:48 +02:00
Michal Nasiadka 4d9379ecc8 Drop Sahara
It's inactive and hasn't produced a 2024.1 release [1].

[1]: https://governance.openstack.org/tc/reference/emerging-technology-and-inactive-projects.html#current-inactive-projects

Change-Id: I7b5b032a4175c5390c9b7ff3fbd4c672adcb5325
2024-04-15 16:55:14 +00:00
Michal Nasiadka 813035ba8f Drop Murano
It's inactive and hasn't produced a 2024.1 release [1].
In addition to that, there's a CVE that hasn't really been patched [2].

[1]: https://governance.openstack.org/tc/reference/emerging-technology-and-inactive-projects.html#current-inactive-projects
[2]: https://lists.openstack.org/archives/list/openstack-announce@lists.openstack.org/thread/4FYM6GSIM5WZSJQIG4TT5Q3UBKQIHLWX/

Change-Id: Ie715eac24247c38b21382c735eb00a9b3b56f145
2024-04-15 13:44:06 +00:00
Michal Nasiadka 4b44da75f0 Revert "openstack-base: Pin tooz to 5.0.0"
This reverts commit 15c37ab76d.

Reason for revert: Merge once tooz 6.0.2 is in u-c

Change-Id: I2c0ef876517a26965ba5b528c0ca260dcc93d248
2024-03-11 18:24:00 +00:00
Michal Nasiadka 15c37ab76d openstack-base: Pin tooz to 5.0.0
tooz 6.0.0 is now in u-c and it broke redis, see [1].
tooz 6.0.1 did not help and 6.0.2 is in the works, see [2].

[1]: https://review.opendev.org/c/openstack/tooz/+/911648
[2]: https://lists.openstack.org/archives/list/openstack-discuss@lists.openstack.org/thread/HHNJ3XZR3DLSFIWXK2TZ3R7QSMMFFVPU/

Change-Id: If9ecf4a7fe703cfb87d4559790b39a5703ae49c4
2024-03-11 09:30:31 +00:00
Michal Arbet 7f5a904e98 Fix openstack CADF audit maps and installation
This patch fixes missing pycadf's audit maps
for services and change the way how pycadf
is installed.

Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/905858

Closes-Bug: #2047941
Change-Id: I9b43d1a9990ad8aa7381ea81b0f2d692967be949
2024-01-17 11:52:20 +00:00
Sahid Orentino Ferdjaoui 8243df271a openstack-base: add block for overriding global upper constraints
Introduces a new block `openstack_base_override_upper_constraints` to
provide users with the capability to globally override version
constraints for services.

This enables more flexible dependency management across all services.

Change-Id: I0d627487973311de8b23dd1519d41a0cab622fac
Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@industrialdiscipline.com>
2023-09-04 12:06:35 +02:00
Marcin Juszkiewicz 19e40f1608 docker: implement macros to alter upper-constraints.txt
upper_constraints_remove() macro allows to remove line
upper_constraints_version_change() allows to change versions

This way we have cleaner way to alter u-c in those images which need it.

Change-Id: I8fc354b8aa4d03fcd3ecfb9cbfe75de67492a0e3
2023-04-21 14:13:24 +02:00
Marcin Juszkiewicz ca16f7ae7d docker: use python3-venv to create virtual env
Debian 'bookworm' does not like when someone installs Python packages
into system directories. So instead of installing 'virtualenv' from pip
we move to use 'python3 -m venv' which we install from distribution
repositories (on Debian/Ubuntu as EL9 has it in base 'python3').

Change-Id: I7092b561d81c362ca24f84a3d753e777e5625ab3
2023-03-20 17:45:08 +01:00
Michal Nasiadka ca0238598a Pin setuptools=67.2.*
67.3.1 is out and it broke Horizon builds

Change-Id: Ie6c078a9c37f54d60f0d5a4aadb647e184489cb8
2023-02-15 11:25:38 +01:00
Michal Nasiadka e221ac8f27 Drop elasticsearch, kibana and logstash
Support has been dropped in kolla-ansible, the upgrade path is opensearch.

Change-Id: I6f32aacb4e0b7dd1eb7206e02425b16f5beae4f0
2022-12-06 15:57:51 +01:00
Marcin Juszkiewicz 878b00013b Move to CentOS Stream 9
OpenStack 'zed' requires Python 3.8+ so RHEL 8 family has to go.

This changeset moves to CentOS Stream 9 while move to RockyLinux 9 is
planned as final solution.

CI moved to CentOS Stream 9 nodes.

Depends-on: https://review.opendev.org/c/openstack/kolla-ansible/+/839715

Change-Id: I113b9984294cf8663d3fc0c8840320e1d40ea731
2022-09-27 07:40:06 +00:00
wu.chunyang 5a65f36e9b Add python-binary-memcached to openstack-base
python-binary-memcached is required by keystone cache.
ref: https://docs.openstack.org/keystone/latest/admin/configuration.html#caching-layer

Change-Id: Ibaf5925607b45bc8e69af39f2d1cdcb49332f9f0
2022-08-25 17:38:41 +08:00
Stephen Finucane a1f55b5bdf Don't install the tooz etcd3 extra
The etcd3 extra in tooz has been deprecated [1] as the library it uses
under the hood, python-etcd3, is currently stale and unmaintained. It
will be removed in a future release. Stop installing this.

[1] 7ee2780af8

Change-Id: Ib54a2868cb33de5fc2800f314b2811c67ef13461
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
2022-08-09 10:58:54 +01:00
Michal Arbet 9dc0df2a99 Add fluent-logger to images
There is proposed change in kolla-ansible below
which is changing the way how central-logging
works and adding native fluent logging.

Because of this, it's needed to add python
fluent library to openstack images.

Proposed Change:
 - https://review.opendev.org/#/c/755775/

Change-Id: Iedc782a3317c93a2af0da4696fd71c05e0e4a55e
2022-04-21 18:54:12 +00:00
Marcin Juszkiewicz 3915785884 drop add_binary_source_envs() macro
With binary install type dropped there is no need for this macro.

Change-Id: I7bdd29eb48a23faa04a98e785129d97258f05e64
2022-04-11 12:09:29 +02:00
Zuul 657820362d Merge "docker: drop binary parts" 2022-04-11 09:39:28 +00:00
Marcin Juszkiewicz a1510870e8 drop infra_image_prefix
We have one install_type only now so that infra stuff is not needed
anymore.

Change-Id: I60d50ba7699d46d001eaef365fb84b0ce8e9b262
2022-04-11 06:22:21 +00:00
Marcin Juszkiewicz 1749da2fbf docker: drop binary parts
Big patch drops all mentions of binary images support. Suggestions are
welcome how to split it into parts or handle better.

Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
2022-04-09 17:44:26 +02:00
Michal Nasiadka 8e8a499adc Use python3-openvswitch from distro
We should use the same Python OVS bindings package
version as running OpenvSwitch. See related bug.

Closes-Bug: #1961874

Change-Id: Id6968e3ec1093f26f25f3045e2a6d8cc4f41adaa
2022-03-01 16:59:33 +00:00
Michal Nasiadka 405fca90f2 Remove missing collectd packages
Since CentOS Linux 8 repository retirement from
CentOS mirrors - we need to use CentOS Stream 8
version of Opstools repo.

Listed below packages are missing from the repo,
and according to the maintainer dpdk_telemetry is
not going to show up at all (it's basically dead).

The rest of the packages might show up at a later
stage - but it's not a priority for the maintainer.

- collectd-dpdk_telemetry
- collectd-libpod-stats
- collectd-sensubility
- python3-sqlalchemy-collectd

Change-Id: I5f446fc276e245c1e6974ceeb6ff3dccd84ee502
2022-02-03 15:13:59 +00:00
Zuul f7ef6c243a Merge "Clean MariaDB/MySQL" 2022-01-20 20:51:22 +00:00
Radosław Piliszek a41001f714 Upgrade pip and friends in source images
New pip has nice features for detection of conflicting
requirements.

When installing from PyPI, as we do in source images, running
the latest pip+setuptools+wheel is recommended.

Co-authored-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Change-Id: I4ae3a82cc796a60450c2a35beba32972964bc5d0
2021-11-26 12:11:12 +00:00
Marcin Juszkiewicz ec06d44d2c openstack-base: drop anyjson
It is required only in Tacker and fails to be installed.

And even Tacker does not use it...

Change-Id: Ic8ebe4089c84f923c24697d632eb294a262059a8
2021-10-20 15:28:20 +02:00
Radosław Piliszek 6b203efde7 Clean MariaDB/MySQL
We are just overinstalling these.
PyMySQL is enough nowadays.

Change-Id: I074d9d13f52c208c0f3d92ea060b3b9abb6a6b9e
2021-10-02 17:41:33 +00:00
Radosław Piliszek d55cd5e5c2 Remove last mongo refs
Drop installation of pymongo because it is not used by Telemetry
since at least Queens [1] [2] and MongoDB is not deployed by
Kolla Ansible since Victoria.

[1] https://review.opendev.org/c/openstack/ceilometer/+/512700
[2] https://review.opendev.org/c/openstack/aodh/+/373043

Change-Id: Id44ab0fe673f01490cd8ca9c51f465ae7ad95e08
2021-06-29 13:50:17 +00:00
Christian Berendt c82683a9ef Sort the package lists in openstack-base alphabetically
Signed-off-by: Christian Berendt <berendt@betacloud-solutions.de>
Change-Id: I4340ac228dc9624e59ed613265e47c3e95d2dc50
2021-05-25 20:32:10 +02:00
Marcin Juszkiewicz 38fcd184e8 centos: enable repos where needed
With RDO use we did not disabled some repositories. This patch disable
them and enable where needed.

Change-Id: Ia9d537fe9c1ad54789d2bfb4027254fbb3defe7e
2021-04-13 11:21:39 +00:00
zhoulinhui 2305c12c56 Remove zaqar client from openstack-base and heat-engine
Change-Id: Idfec98f5dee6419dabbd0824b60af60eb0ecd3f2
2021-02-06 23:14:03 +08:00
Zuul 44578c6809 Merge "openstack-base: move some packages from child images" 2021-01-26 20:48:07 +00:00
Marcin Juszkiewicz ffe08baa72 docker: do not install pip again in images
We install pip in base image so why repeat?

Change-Id: Id903880b121d87d75b7b14084b0961b9ce99deba
2021-01-25 16:43:18 +01:00
Marcin Juszkiewicz 59d8abbd58 openstack-base: move some packages from child images
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
2021-01-18 11:41:21 +01:00
Marcin Juszkiewicz 6cc97876cc centos: do not enable PowerTools repo in base
This repo is only needed for source openstack-base.

Change-Id: I835c18424153f8529a37fc78e16d2becacb71263
2020-12-11 19:58:55 +00:00
Michal Nasiadka b1709a87ed Use upper constraints for virtualenv in openstack-base
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-10-19 10:38:46 +00:00
Marcin Juszkiewicz 87730f8f7c create 'add_binary_source_envs' macro and use it
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-21 12:10:57 +00:00
Gaël THEROND (Fl1nt) b93c40a363 Improve pip install process for offline deployment.
* "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-09-17 13:50:15 +00:00
Radosław Piliszek 6319bc6f55 Remove weird deps
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-11 19:07:09 +02:00
James Kirsch 5bdf514645 Refactor httpd install to base image
Refactor installing and initial setup of httpd and mod wsgi from
individual services to base image.

Change-Id: I651a55a9ebe258ef403d33de010a4dfb368a4021
2020-08-10 09:51:07 +00:00
Marcin Juszkiewicz 90adc2b851 introduce 'infra_image_prefix' for infra images
Defaults to 'image_prefix' for now but shows which images gets their
names changed soon.

Change-Id: I0608e8f62f28d6667b4c8753c47553e4cbf75503
2020-07-09 23:31:42 +02:00
gugug e332891a8a Remove the congress images since it has been retired
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-06-19 18:13:53 +00:00
Marcin Juszkiewicz 1dfd937cba CentOS: disable more repos
'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-05-17 11:34:12 +00:00
Marcin Juszkiewicz 53443c5c71 Remove support for CentOS 7
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-15 09:32:06 +00:00
Marcin Juszkiewicz 2749e46019 openstack-base: PyNaCl needs 'make' to build
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-04-08 21:11:09 +00:00
Marcin Juszkiewicz 5969a1ca41 Revert "openstack-base: pin setuptools < 46 to get horizon working"
pyScss 1.3.6 release has required fixes and horizon is using it.

This reverts commit 5498671b34.

Change-Id: I27bf14a8ff81086174eb0d55501039d4678b015e
2020-03-30 15:44:49 +00:00
Radosław Piliszek 3e4f3b18dd Fix Horizon build after switch to pyscss2 which lacks binary wheel
It now requires pcre-dev package to finish building.

Change-Id: I4e003c9aa32579d467c489a53741e20ced2f4b52
Closes-bug: #1867888
2020-03-18 09:09:58 +01:00
Marcin Juszkiewicz 5498671b34 openstack-base: pin setuptools < 46 to get horizon working
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-12 08:25:03 +00:00
Christian Berendt 861f55fbfd Add block labels to all Dockerfiles
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
2020-03-01 17:25:58 +00:00
Mark Goddard 1fe8012ce2 Actually disable EPEL, and epel-modular
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-02-26 13:46:04 +00:00
Mark Goddard 3c618a1f6f CentOS 8: base and openstack-base images
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-09 17:51:42 +00:00
Radosław Piliszek 0186c5e3ca Install etcd3gw to fix Ubuntu binary tooz coordination
Change-Id: Ib56e62d1fb4d0fc4a6c627b87a929be0bc614d1e
Closes-bug: #1852086
2019-12-03 14:28:26 +01:00