Commit Graph

431 Commits

Author SHA1 Message Date
Michal Arbet 2bfdf4e7c9 Bump proxysql to 2.6.x
This patch bump proxysql 2.5.x to 2.6.x

Change-Id: I26e6c04ad0ba15ad4aa90f95259dc41cad439e73
2024-03-18 20:32:20 +01:00
Michal Nasiadka 1edd9b38b6 ceph: Update EL9 version to Reef, adapt docs
Change-Id: I736fcfd766a378783dbfe06ab8ac58858e84aba7
2024-02-08 13:10:58 +01:00
Zuul 9ebd51f799 Merge "Revert "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean (Bobcat)"" 2024-01-03 15:58:27 +00:00
Michal Nasiadka 559955d5a6 Revert "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean (Bobcat)"
This reverts commit 2ed66effa6.

Reason for revert: Let's use RDO trunk

Change-Id: I3945fe5fd0aef2e12a7f6c60d714e69ea496083b
2023-12-20 17:05:25 +00:00
Pierre Riteau 33c988a6ce Update Ceph repo name for dnf config-manager command
Since change I1bc19f8198da3f9ab2ae2a8864c3349b21b0249e we install the
centos-release-ceph-reef package as a dependency, but some code was
still expecting the quincy package.

Change-Id: I8ebcf815d80f3bead25e0078d69b34e17ad013bd
2023-11-22 10:06:39 +00:00
Michal Nasiadka 2ed66effa6 CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean (Bobcat)
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/900536

Change-Id: I1bc19f8198da3f9ab2ae2a8864c3349b21b0249e
2023-11-09 18:11:16 +01:00
Zuul e770021469 Merge "Revert "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean"" 2023-10-24 16:16:23 +00:00
Michal Arbet a1261160da Debian: Switch from antelope to bobcat APT repository
Change-Id: Ife390597433fcededf15ecc09db626983e1b8cfd
2023-10-05 12:04:32 +02:00
Michal Nasiadka 43d50b7c8b Revert "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean"
This reverts commit 881e3925c7.

Reason for revert: switch back to master, to be followed by switch to bobcat when available

Change-Id: Ib8fdad41a669fc8404b8de2de5361db9547c4ea2
2023-10-05 09:57:38 +00:00
Michal Nasiadka 5ef06be743 rabbitmq: use launchpad as erlang source for Ubuntu
Launchpad is not traffic constrained, so let's better use that,
instead of the community mirror.

Change-Id: Ie9e0f574c8e3a61e67736caa3faedb8602a5adde
2023-09-29 12:46:18 +00:00
Michal Nasiadka 47b593d1e5 rabbitmq: Use novemberain repos for Debian/Ubuntu
CloudSmith is over budget, see [1].

As mentionedin in [2] - we're using amd64 packages on aarch64,
since the community mirror does not mirror aarch64 - and the packages
should be really marked as noarch.

[1]: https://github.com/rabbitmq/rabbitmq-server/discussions/9526
[2]: https://github.com/rabbitmq/rabbitmq-server/discussions/9553

Closes-Bug: #2037469

Change-Id: I83179ce5d53fed6cfe7f5fcbf6fdecd7199baa36
2023-09-29 04:58:34 +00:00
Sven Kieske 0a9da95183
remove unused crmsh EL7 repo
Change-Id: I1967202e23405ad713fd0d54337754d46566156d
Signed-off-by: Sven Kieske <kieske@osism.tech>
2023-09-11 09:18:55 +02:00
Marcin Juszkiewicz 7fa2ac132c Move to Debian 12 'bookworm'
We move to use some components from distribution instead of 3rdparty
repos. At least for now - this may/will change later.

Packages from Debian:
- Erlang 25.2
- MariaDB 10.11

Some Ubuntu/jammy repositories are used in places where there is not
(yet) Debian/bookworm one.

openvswitch-netcontrold image fails as it needs to be converted to use
virtualenv - added into unbuildable images for now.

See https://etherpad.opendev.org/p/kolla-bobcat-ptg#L199 for more information.

Depends-On: https://review.opendev.org/891946

Change-Id: I45b5a5980fb2318f1aab23a3a6aaf0922563b171
2023-08-18 06:48:11 +00:00
Marcin Juszkiewicz 3e4d291b12 base: Debian 12 uses new APT sources file
For start we will use same APT sources.list format as we used in past
(and use with Ubuntu). But we need to remove what is in container to
make sure that CI jobs would use mirror only.

Change-Id: I82dd0e8667e44250d2892538819c12e6c775618b
2023-06-28 18:19:31 +02:00
Marcin Juszkiewicz 3de04436fa base: install adduser on Debian/Ubuntu
Debian:bookworm container does not have 'adduser' installed so
we need to do it before we touch /etc/adduser.conf file.

In Bookworm configuration file for adduser changed.

Change-Id: Ic06f3c0e42fb7854e5b198c9b868f10cd507cd24
2023-06-28 18:19:31 +02:00
Zuul 427c8b66aa Merge "rabbitmq: use erlang-25 ppa on Debian/Ubuntu" 2023-06-21 16:19:28 +00:00
Michal Nasiadka 0e881148d0 rabbitmq: use erlang-25 ppa on Debian/Ubuntu
RMQ team is now maintaining erlang-24, erlang-25 ppas, see [1].

[1]: https://github.com/rabbitmq/erlang-debian-package/discussions/33

Change-Id: I7e289bd5ce52319604717e0b319d0642a8e598db
2023-06-21 10:48:04 +00:00
Michal Arbet 60603d240c Bump proxysql version
This patch bumps proxysql 2.4.x to 2.5.x

Change-Id: I6a67910965e38b53958fc6f8546fa6f665a47a16
2023-06-20 13:18:18 +00:00
Michal Arbet 4950c03e59 Fix rabbitmq image build
This patch is replacing ppa.launchpadcontent.net
by ppa1.novemberain.com.

Reason for replacement is that only latest erlang version
is available on the current ppa source.

Setting Debian ARM jobs non voting for now, since the new ppa
does not contain arm64 packages.

This repo is based on the official Erlang/OTP package
for Debian. The RabbitMQ team adapted the upstream package
to produce packages for more/different combinations of
Erlang/OTP, Debian and Ubuntu releases.

Change-Id: Iddec6ec555f98e13c2f199e5ca7dad7f4819b1a8
2023-06-14 21:28:05 +00:00
Michal Nasiadka 881e3925c7 CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean
Antelope was released, landed in CentOS repo, time to use it.

Change-Id: I9fa8fd5dd9b75251363f1957d1e249e7cb4beb84
2023-05-17 16:44:33 +00:00
Michal Nasiadka 6bd7898a1d opensearch: move to yum/apt repos
systemd-tmpfiles is needed otherwise opensearch
postinst on Debian/Ubuntu fails

Change-Id: I5aeb5796f8de7697a1c4a7404fe292ef9eb522ee
2023-04-25 11:38:49 +02:00
Piotr Parczewski 2ddf0aeb20 Replace invisible unicode chars
They're believed to have no special meaning and were put by accident.

TrivialFix

Change-Id: I66ea5711810ed0060cf89192a780bfcc92e79770
2023-03-28 14:09:01 +02:00
Michal Nasiadka 9ea0725dac grafana: update urls
As per [1].

[1]: https://packages.grafana.com

Change-Id: I7087bafffc56b6e660ec77ebeadb9132525697bb
2023-02-01 08:42:35 +00:00
Michal Nasiadka ab70c7618b influxdb: Update gpg key
Influx repo gpg key has been rotated as of of 2023-01-26 [1].

[1]: https://www.influxdata.com/blog/linux-package-signing-key-rotation/

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

Change-Id: I76b35bb20ddc0130ca15ff03942e1a97f5d36ff0
2023-01-30 13:10:27 +00:00
Michal Nasiadka 1371e4fc5b Add util-linux to centos base packages
Currently /usr/sbin/nologin is missing, because util-linux
is not installed in the image.

Change-Id: I717b4f2215054ef9135a1ac252ed26820bdcb1aa
2023-01-25 16:22:15 +00:00
Michal Nasiadka 47a9a81859 grafana: remove SHA1 workaround
Change-Id: I08fe2827bc58baa95d396daf28de1079e3df4f77
2023-01-18 07:39:30 +01:00
Marcin Juszkiewicz d73dc618aa CentOS: move gpg keys to repo files
Definition of 3rdparty repo can contain also url to gnupg key used to
sign files there.

DNF knows how to handle that so we do not need to import keys in base
image anymore.

Functionality stays as people may use own repos with own keys.

Change-Id: I88e8e86ca35ee1b6b6b5551c3ca8698f0ed814cb
2023-01-02 13:47:19 +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
Zuul 4a90585634 Merge "rabbitmq/aarch64: use COPR for Erlang" 2022-10-18 15:53:54 +00:00
Marcin Juszkiewicz e104ef7fdc rabbitmq/aarch64: use COPR for Erlang
RabbitMQ team maintains RPM package in Github repo [1]. Hrw then use it
to build package using COPR service [2].

This way we have latest Erlang on both distributions and both
architectures.

1. https://github.com/rabbitmq/erlang-rpm/
2. https://copr.fedorainfracloud.org/coprs/hrw/erlang-for-rabbitmq/

Change-Id: I425ae2fab78e80ff56f21fd1b24708906ec32342
2022-10-18 15:23:19 +02:00
Marcin Juszkiewicz b40506f6dd rabbitmq: use Erlang from PPA on Debian/Ubuntu
PPA from Team RabbitMQ [1] provides newer Erlang for Debian/Ubuntu.

This way we have latest Erlang on both distributions and both
architectures.

1. https://launchpad.net/~rabbitmq/+archive/ubuntu/rabbitmq-erlang

Change-Id: Iec7e8461f9eb757e1576cf3898068306c5436239
2022-10-14 11:30:06 +02:00
Michal Nasiadka f0849eca8d proxysql: Use almalinux for centos/rocky9
As per https://github.com/sysown/proxysql/issues/3989

Change-Id: If077d60e9efd29fab80f4f5188a4f54015734a92
2022-10-03 13:30:43 +02:00
Michal Nasiadka 0883532434 Add RockyLinux 9 support
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/859570

Change-Id: I7af51d07b8a939c908aa072294061def57dd67de
2022-09-30 14:17:34 +00:00
Marcin Juszkiewicz ac1ae84386 centos: use Erlang 24 on AArch64
We do not have Erlang 25 for CentOS Stream 9 on AArch64 so we revert to
use Erlang 24 from CentOS repository.

Also synced Erlang and RabbitMQ versions between images.

Change-Id: I1480de095eaea66c3a83a61ca3ff269953181e39
2022-09-28 17:05:29 +00:00
Zuul 2185f817ba Merge "Don't ignore the remaining apt-get update errors" 2022-09-27 12:37:18 +00:00
Radosław Piliszek 9dd9f425b7 Don't ignore the remaining apt-get update errors
Follow-up to I5ce2eb66a647e1805f086aa37942bf5d13eb4106

So far, I have only observed these causing weird errors later but,
in theory, ignoring these could allow the rest of the code to use
archival (so wrong) entries.

Change-Id: I9cef5ceeb78d431ca232c7b196c48eef5d2ccbca
2022-09-27 10:04:19 +00:00
Marcin Juszkiewicz 542bbcdb6b grafana: ignore SHA1 gpg key on CentOS Stream 9 (and family)
RHEL 9 refuses to use SHA1 gpg keys. Grafana team still did not handled
key upgrade:

https://github.com/grafana/grafana/issues/41036

Change-Id: Id963271103ce1397b7a5498d032e8f797edfcc70
2022-09-27 08:17:15 +00: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
Marcin Juszkiewicz e8d085b606 Debian: use OpenStack Zed repos
With source base images we use small amount of packages from there.
Some Python/JS updates and novnc/spice stuff.

Change-Id: I41d8d3ae0e43ba7b54b126e076134f13dcab7859
2022-09-01 10:05:57 +02:00
Zuul a1021d6599 Merge "Revert "Workaround setuptools==60.0.0 breakages"" 2022-08-31 13:40:21 +00:00
Michal Arbet 25ae26e77c Update ProxySQL to version 2.4
This patch is updating ProxySQL from
version 2.3 to version 2.4, which
has several new features and bugfixes.

Change-Id: I625f72aac591aee8b1efe51f0b4a9e7660e6dbdc
2022-07-21 14:28:49 +02:00
Radosław Piliszek 9d5bdbf36d Use the new image naming scheme by default
Adds a relevant reno to inform users about the change and the
possibility to customise the prefix.

Additionally, this patch includes the fix to Ubuntu image builds
regarding rabbitmq and erlang.

Both the changes are required to fix master CI.

Change-Id: I6bc8b489a810849744c8bead6b9e350c5d3e36b7
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/843752
2022-05-29 18:14:01 +00:00
Tim Shearer 1d96a2bbe1 Adjust permissions on _extend_start files.
Explicitly set the permissions on the kolla-toolbox kolla_extend_start
file. Also, since all extend_start files are sourced rather than
executed, the executable bits are now cleared throughout the project.

Change-Id: I5c2deb4a2e33575d57c852089f856a9acc6818d0
2022-04-11 17:22:24 +02:00
Maksim Malchuk 83efe32546 Unify curl use (customisation options)
This change adds and unifies an ability to override hardcoded URLs for
air-gapped environments via the usual blocks mechanism. Also, this
change replaces ENV with ARG instruction for the variables used only
in building images, and uses bash variable expansion where it possible.

This change is a continuation of the I46b77978926fc2b578a68d1aaa944b2198af0685

Change-Id: I1fbad333b1bc95484e6f4c5145d5936a0e2db84f
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
2022-03-11 15:58:05 +03:00
Marcin Juszkiewicz bd0760e78c Debian: use Yoga OpenStack repos
Change-Id: I27910e25183a373d0d89ea6f9f4e30e118f21422
2022-03-07 11:02:26 +01:00
Marcin Juszkiewicz f943c7d773 erlang: use packages from Erlang Solutions on AArch64
RabbitMQ requires Erlang 23+ and soon will bump to 24+.

On AArch64 we used version 22 as there was no other option. Now it is.

Change-Id: I667ccda5bb4edbfbfb97dfb0cea264837ed05cae
2022-02-05 10:37:41 +01:00
Marcin Juszkiewicz 355858d3c1 base: do not duplicate repo data on CentOS
Instead of listing all repositories twice, do it just once and then add
architecture specific ones.

Change-Id: Icf0675c17a5227643148e9956496b8eacec67bee
2022-01-04 14:53:30 +01:00
Maksim Malchuk cb99f46929 Fix variable name
TrivialFix

The customization format of the variable name should contain the
<image_name> [1]. This change fixes the name of the 'remote_apt_keys'
variable in base Dockerfile.

1. https://docs.openstack.org/kolla/latest/admin/image-building.html#dockerfile-customisation

Change-Id: I423db39e77f337a73d3d88e3dbd56469be45110b
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
2021-12-28 11:02:25 +00:00
Zuul 4555892424 Merge "Add HTTP proxy support for fetching APT keys" 2021-12-21 13:12:51 +00:00
Dr. Jens Harbott 1d324d7d7a Revert "Workaround setuptools==60.0.0 breakages"
This reverts commit b69c589718.

Reason for revert: The original commit was a hotfix to work around build failures, we should try to move back to a normal state again.

Change-Id: Iff79de9dabcd4bba795f3c44d3017baa5a860306
2021-12-21 05:18:48 +00:00