Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .zuul.d/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,31 @@
7xlK/HOqvgMubcqzR33mRoSnkcnFpD50O9k41ZsF9SPKHMGmk9LyI05vkL6bcc3ypLBQY
BTdg70hF/5m6rHFbVCsNDPlVykcEzsW6D4qqxh/5b3LHbPYbe7ciXcc+PTnYb8=

- secret:
name: kolla_copr_webhooks
data:
urls: !encrypted/pkcs1-oaep
- IOTnCYHKs2AOvo5eRCUyy2e7mmo4zzPsTjcYJUlX1g+S93hXxqq3jS/EXJUE57TOJePeS
saLbrFZyBScL9oYZaXiXPDiGMUHH09AdcdKJ18KhYGnYPx9j5o7ya0HBfbVD736JQrLGV
oa08Rav+27I9guYu2V3B9CH+BQId0iujceeoVd0keUHoZFkTBrdX4rjQ6QlpcCn2KFcMG
EAeVM6SFXU8KSm5b7/T7cKJmyuQk3uAD0R/RaY4L4GLKdZMgG2rf0AA/sOAbZgIf/nqem
vwyJRM342fVKDozOivDMNcqMVjKtOwr/+CL3M2cTktxYq/WOVTxY72c/mjt2AE9lbDNu3
zMMz+95fdkMUdlowC0ODcGL6M4DOlsrZpiUO9iaIqBpl9iJtZsAVB3/Zbb0LBJ3+o3Sp5
rcYMwhICSITXECvERz9R63MGvtf3DaucKkJRtTri6Utwc9ZCCU0ZsW9jzJZ1roqMjzWEJ
oWg4uIrlzE7T96I8zly/nyYJJEYIE5/qmzg03cVTGRkq803PclDWuGJt9isUVqnTj07XZ
d06KIU2FmRPuC4L4XmHU5wMmE/XwqO6LkTlFhXJCnhpQTp9kcRIt680+3DWwSHQsL47Ld
o2tX1XeVm2m7IK3Xy8I6TwIpSJ8B43afKBFRg1w79yXrHSOMNj6fuNJ+WU/Us8=
- HIkK4PWDXI7VFNVm+/+qKmfEze/02zNi77wUH5sJLbShN1JVwLoJDdXNN9wmcIWWFDMkh
On4sMuW9OLZvaNl23/Hs9SPHfGJDalgT4UBxqO15JUiojptZwxTzT+A654D5szsEU3LHU
zNe/Ly0AW0WmjjDkP3waCyBk5WfR3LfTSTlVw3yK6t71V/XbYJIm9m+c47dgBWMuL4Voj
xOMTBYXyUQYpdB744Hc3F4ensoE9SHlSIpgmmaiWW+DMHRz4Diz1Kppb67ts34kVRyf/B
EVlEjxr7IBR5+ZpuCPNSDJALkl/nw4tXoaw0u+VazgBOYJsdQq2OJFXhiGNFAeO8p3Kqw
ALkf8du+CXAeBBumODBToZRPb9vARlPVind/svJXdDwZfSixfCHvRQ9gEagNzYYo/CjFV
JBZpzG1NX/C5WNtvrltemaeyL120x6VnXvz7oL4v8lgIlGM4MSg8miKvgCl/IXBLqoKq1
0mRmqVQVjaIhLpc9UzzB3MByQzlErmYXNjzrZRICzmiQocLCTjKebzUn4dhYQ1SIjufjV
Xe09WORotwmRLkhr76gZqpYOaTyWDjYZUwcMigQMj+iNQQmUPCqasUkVai5VLH7A2cX8V
IKnI6zygwIHXLVrmtUGh5V8eXPXw4RdhILS7vSw65jk4qjJwniNcd5kXzMINRA=

- nodeset:
name: kolla-centos-9-stream
nodes:
Expand Down
5 changes: 2 additions & 3 deletions .zuul.d/debian.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
- kolla-build-debian
- kolla-build-debian-podman
- kolla-ansible-debian
- kolla-ansible-debian-upgrade:
voting: false
- kolla-ansible-debian-upgrade
check-arm64:
jobs:
- kolla-build-debian-aarch64
Expand All @@ -16,7 +15,7 @@
- kolla-build-debian
- kolla-build-debian-podman
- kolla-ansible-debian
# - kolla-ansible-debian-upgrade
- kolla-ansible-debian-upgrade
periodic:
jobs:
- kolla-publish-debian-quay
Expand Down
14 changes: 12 additions & 2 deletions .zuul.d/ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
files: ^docker/proxysql/
- kolla-ansible-ubuntu-bifrost:
files: ^docker/bifrost/
- kolla-ansible-ubuntu-zun:
files: ^docker/|zun/
check-arm64:
jobs:
- kolla-build-ubuntu-aarch64
Expand All @@ -45,6 +43,9 @@
periodic:
jobs:
- kolla-publish-ubuntu-quay
periodic-weekly:
jobs:
- kolla-copr-erlang-update
experimental:
jobs:
- kolla-build-no-infra-wheels-ubuntu
Expand Down Expand Up @@ -91,3 +92,12 @@
nodeset: kolla-ubuntu-noble
vars:
base_distro: ubuntu

- job:
name: kolla-copr-erlang-update
parent: base
nodeset: kolla-ubuntu-noble
timeout: 3600
run: tests/playbooks/copr-erlang-update.yml
secrets:
- kolla_copr_webhooks
15 changes: 4 additions & 11 deletions doc/source/admin/image-building.rst
Original file line number Diff line number Diff line change
Expand Up @@ -683,23 +683,16 @@ Red Hat

Kolla allows the operator to build containers using custom repos.
The repos are accepted as a list of comma separated values and can be in the
form of ``.repo``, ``.rpm``, or a url. See examples below.

To use current RDO packages (aka Delorean or DLRN), update ``rpm_setup_config``
in ``kolla-build.conf``:

.. path /etc/kolla/kolla-build.conf
.. code-block:: ini

rpm_setup_config = https://trunk.rdoproject.org/centos8/current/delorean.repo,https://trunk.rdoproject.org/centos8/delorean-deps.repo
form of ``.repo``, ``.rpm``, or a url.

If specifying a ``.repo`` file, each ``.repo`` file will need to exist in the
same directory as the base Dockerfile (``kolla/docker/base``):
same directory as the base Dockerfile (``kolla/docker/base``) or you need to
specify a url:

.. path kolla/docker/base
.. code-block:: ini

rpm_setup_config = epel.repo,delorean.repo,delorean-deps.repo
rpm_setup_config = epel.repo,https://remote-server.com/your-repo.repo

Debian / Ubuntu
^^^^^^^^^^^^^^^
Expand Down
47 changes: 37 additions & 10 deletions doc/source/contributor/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ Communication
IRC Channel
``#openstack-kolla`` (`channel logs`_) on `OFTC <http://oftc.net>`_

`Weekly Meetings <https://meetings.opendev.org/#Kolla_Team_Meeting>`_
Weekly Meetings
In the IRC channel (`meeting information`_)

Mailing list (prefix subjects with ``[kolla]``)
https://lists.openstack.org/pipermail/openstack-discuss/
Expand All @@ -40,7 +41,7 @@ Whiteboard (etherpad)
https://etherpad.openstack.org/p/KollaWhiteBoard

.. _channel logs: https://meetings.opendev.org/irclogs/%23openstack-kolla/
.. _meetings logs: https://meetings.opendev.org/meetings/kolla/
.. _meeting information: https://meetings.opendev.org/#Kolla_Team_Meeting

Contacting the Core Team
~~~~~~~~~~~~~~~~~~~~~~~~
Expand All @@ -49,8 +50,8 @@ In general it is suggested to use the above mentioned public communication
channels, but if you find that you need to contact someone from the Core team
directly, you can find the lists in Gerrit:

- kolla-core https://review.opendev.org/admin/groups/28d5dccfccc125b3963f76ab67e256501565d52b,members
- kayobe-core https://review.opendev.org/admin/groups/361e28280e3a06be2997a5aa47a8a11d3a8fb9b9,members
- `Kolla core team <https://review.opendev.org/admin/groups/kolla-core,members>`__
- `Kayobe core team <https://review.opendev.org/admin/groups/kayobe-core,members>`__

New Feature Planning
~~~~~~~~~~~~~~~~~~~~
Expand All @@ -61,20 +62,30 @@ prefix).
Task Tracking
~~~~~~~~~~~~~

Kolla project tracks tasks in `Launchpad <https://bugs.launchpad.net/kolla>`__.
Note this is the same place as for bugs.
Kolla family projects track tasks and bugs in Launchpad:

- `Kolla <https://bugs.launchpad.net/kolla>`__
- `Kolla Ansible <https://bugs.launchpad.net/kolla-ansible>`__
- `Ansible Collection Kolla <https://bugs.launchpad.net/ansible-collection-kolla>`__
- `Kayobe <https://bugs.launchpad.net/kayobe>`__

If you're looking for some smaller, easier work item to pick up and get started
on, search for the 'low-hanging-fruit' tag.
on, search for the 'low-hanging-fruit' tag in the relevant project.

A more lightweight task tracking is done via etherpad - `Whiteboard <https://etherpad.openstack.org/p/KollaWhiteBoard>`__.

Reporting a Bug
~~~~~~~~~~~~~~~

You found an issue and want to make sure we are aware of it? You can do so
on `Launchpad <https://bugs.launchpad.net/kolla>`__.
Note this is the same place as for tasks.
You found an issue and want to make sure we are aware of it?
Please report it in the appropriate Launchpad project:

- `Kolla <https://bugs.launchpad.net/kolla>`__
- `Kolla Ansible <https://bugs.launchpad.net/kolla-ansible>`__
- `Ansible Collection Kolla <https://bugs.launchpad.net/ansible-collection-kolla>`__
- `Kayobe <https://bugs.launchpad.net/kayobe>`__

Note these are also used for task tracking.

Getting Your Patch Merged
~~~~~~~~~~~~~~~~~~~~~~~~~
Expand All @@ -86,6 +97,22 @@ is described in :ref:`its own section <release-notes>`.

Significant changes should have documentation and testing provided with them.

To see an overview of in-progress patches, sorted into useful sections, you can
view the:

- `Kolla Review Dashboard <https://review.opendev.org/dashboard/?title=Kolla+Review+Dashboard&foreach=project%3Aopenstack%2Fkolla+status%3Aopen+NOT+label%3AWorkflow%3C%3D%2D1+NOT+label%3ACode%2DReview%3C%3D%2D2&High+priority+changes=label%3AReview%2DPriority%3D2&Priority+changes=label%3AReview%2DPriority%3D1&Feature+freeze=label%3AReview%2DPriority%3D%2D1&Stable+branch+backports=branch%3A%5Estable%2F.%2A+status%3Aopen+NOT+label%3AReview%2DPriority%3D%2D1&Small+things+%28%3C25+LOC%2C+limit+25%29+on+master+branch=delta%3A%3C%3D25+limit%3A25+NOT+label%3ACode%2DReview%2D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+Final+Approval+%28to+land+on+master+branch%29=NOT+label%3AWorkflow%3E%3D1+NOT+label%3AWorkflow%3C%3D%2D1+NOT+owner%3Aself+label%3ACode%2DReview%3E%3D2+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+revisit+%28You+were+a+reviewer+but+haven%27t+voted+in+the+current+revision%29=reviewer%3Aself+limit%3A50&Newer+%28%3C1wk%29+Open+Patches+%28limit+25%29+on+master+branch=%2Dage%3A1week+limit%3A25+NOT+label%3AWorkflow%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3ACode%2DReview%3E%3D2+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Older+%28%3E1wk%29+Open+Patches+Passing+Zuul+Tests+%28limit+50%29+on+master+branch=age%3A1week+limit%3A50+NOT+label%3AWorkflow%3E%3D1+NOT+label%3ACode%2DReview%3C%3D%2D1+NOT+label%3ACode%2DReview%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster>`__

- `Kolla Ansible Review Dashboard <https://review.opendev.org/dashboard/?title=Kolla%2DAnsible+Review+Dashboard&foreach=project%3Aopenstack%2Fkolla%2Dansible+status%3Aopen+NOT+label%3AWorkflow%3C%3D%2D1+NOT+label%3ACode%2DReview%3C%3D%2D2&High+priority+changes=label%3AReview%2DPriority%3D2&Priority+changes=label%3AReview%2DPriority%3D1&Feature+freeze=label%3AReview%2DPriority%3D%2D1&Stable+branch+backports=branch%3A%5Estable%2F.%2A+status%3Aopen+NOT+label%3AReview%2DPriority%3D%2D1&Small+things+%28%3C25+LOC%2C+limit+25%29+on+master+branch=delta%3A%3C%3D25+limit%3A25+NOT+label%3ACode%2DReview%2D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+Final+Approval+%28to+land+on+master+branch%29=NOT+label%3AWorkflow%3E%3D1+NOT+label%3AWorkflow%3C%3D%2D1+NOT+owner%3Aself+label%3ACode%2DReview%3E%3D2+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+revisit+%28You+were+a+reviewer+but+haven%27t+voted+in+the+current+revision%29=reviewer%3Aself+limit%3A50&Newer+%28%3C1wk%29+Open+Patches+%28limit+25%29+on+master+branch=%2Dage%3A1week+limit%3A25+NOT+label%3AWorkflow%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3ACode%2DReview%3E%3D2+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Older+%28%3E1wk%29+Open+Patches+Passing+Zuul+Tests+%28limit+50%29+on+master+branch=age%3A1week+limit%3A50+NOT+label%3AWorkflow%3E%3D1+NOT+label%3ACode%2DReview%3C%3D%2D1+NOT+label%3ACode%2DReview%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster>`__

- `Ansible Collection Kolla Review Dashboard <https://review.opendev.org/dashboard/?title=ansible%2Dcollection%2Dkolla+Review+Dashboard&foreach=project%3Aopenstack%2Fansible%2Dcollection%2Dkolla+status%3Aopen+NOT+label%3AWorkflow%3C%3D%2D1+NOT+label%3ACode%2DReview%3C%3D%2D2&High+priority+changes=label%3AReview%2DPriority%3D2&Priority+changes=label%3AReview%2DPriority%3D1&Feature+freeze=label%3AReview%2DPriority%3D%2D1&Stable+branch+backports=branch%3A%5Estable%2F.%2A+status%3Aopen+NOT+label%3AReview%2DPriority%3D%2D1&Small+things+%28%3C25+LOC%2C+limit+25%29+on+master+branch=delta%3A%3C%3D25+limit%3A25+NOT+label%3ACode%2DReview%2D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+Final+Approval+%28to+land+on+master+branch%29=NOT+label%3AWorkflow%3E%3D1+NOT+label%3AWorkflow%3C%3D%2D1+NOT+owner%3Aself+label%3ACode%2DReview%3E%3D2+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+revisit+%28You+were+a+reviewer+but+haven%27t+voted+in+the+current+revision%29=reviewer%3Aself+limit%3A50&Newer+%28%3C1wk%29+Open+Patches+%28limit+25%29+on+master+branch=%2Dage%3A1week+limit%3A25+NOT+label%3AWorkflow%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3ACode%2DReview%3E%3D2+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Older+%28%3E1wk%29+Open+Patches+Passing+Zuul+Tests+%28limit+50%29+on+master+branch=age%3A1week+limit%3A50+NOT+label%3AWorkflow%3E%3D1+NOT+label%3ACode%2DReview%3C%3D%2D1+NOT+label%3ACode%2DReview%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster>`__

- `Kayobe Review Dashboard <https://review.opendev.org/dashboard/?title=Kayobe+Review+Dashboard&foreach=%28project%3Aopenstack%2Fkayobe+OR+project%3Aopenstack%2Fkayobe%2Dconfig+OR+project%3Aopenstack%2Fkayobe%2Dconfig%2Ddev%29+status%3Aopen+NOT+label%3ACode%2DReview%3C%3D%2D2+NOT+label%3AWorkflow%3C%3D%2D1&High+priority+changes=label%3AReview%2DPriority%3D2&Priority+changes=label%3AReview%2DPriority%3D1&Feature+freeze=label%3AReview%2DPriority%3D%2D1&Stable+branch+backports=branch%3A%5Estable%2F.%2A+status%3Aopen+NOT+label%3AReview%2DPriority%3D%2D1&Small+things+%28%3C25+LOC%2C+limit+25%29+on+master+branch=delta%3A%3C%3D25+limit%3A25+NOT+label%3ACode%2DReview%2D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+Final+Approval+%28to+land+on+master+branch%29=NOT+label%3AWorkflow%3E%3D1+NOT+label%3AWorkflow%3C%3D%2D1+NOT+owner%3Aself+label%3ACode%2DReview%3E%3D2+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+revisit+%28You+were+a+reviewer+but+haven%27t+voted+in+the+current+revision%29=reviewer%3Aself+limit%3A50&Newer+%28%3C1wk%29+Open+Patches+%28limit+25%29+on+master+branch=%2Dage%3A1week+limit%3A25+NOT+label%3AWorkflow%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3ACode%2DReview%3E%3D2+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Older+%28%3E1wk%29+Open+Patches+Passing+Zuul+Tests+%28limit+50%29+on+master+branch=age%3A1week+limit%3A50+NOT+label%3AWorkflow%3E%3D1+NOT+label%3ACode%2DReview%3C%3D%2D1+NOT+label%3ACode%2DReview%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster>`__

.. note::

If you feel that your change is getting overlooked, reach out via
:ref:`preferred communication methods <communication>` to let us know.

Project Team Lead Duties
~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down
17 changes: 0 additions & 17 deletions doc/source/contributor/release-management.rst
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,6 @@ R-8: Switch images to current release
.. note:: Debian does not provide repositories for the in-development release
until much later in the cycle.

* [kolla] Switch CentOS images to use the current in-development release
master RDO Delorean repository

* example: https://review.opendev.org/c/openstack/kolla/+/804269

* [kolla] Switch Ubuntu images to use the current in-development release
Ubuntu Cloud Archive (UCA) repository

Expand Down Expand Up @@ -237,11 +232,6 @@ Prior to creating an RC1 release candidate:

* example: TODO

* [kolla] Switch CentOS images to use the current in-development release
stable RDO Delorean repository

* example: https://review.opendev.org/c/openstack/kolla/+/787339

R-0: Kolla & Kolla Ansible RC1 & stable branch creation
-------------------------------------------------------

Expand Down Expand Up @@ -407,13 +397,6 @@ Several tasks are required to finalise the stable branch for release.

* example: https://review.opendev.org/c/openstack/kolla-ansible/+/788292

* [kolla] Switch CentOS images to use the CentOS Cloud SIG repository for the
new release

.. note:: This needs to be done on the stable branch.

* example: https://review.opendev.org/c/openstack/kolla/+/788490

* [kolla] Switch Debian images to use the Debian OpenStack repository
for the new release

Expand Down
2 changes: 1 addition & 1 deletion doc/source/contributor/versions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ information about package sources.
.. _`Team RabbitMQ 'Cloudsmith' repo (Deb)`: https://www.rabbitmq.com/install-debian.html#apt-cloudsmith
.. _`Team RabbitMQ 'Modern Erlang' PPA`: https://launchpad.net/~rabbitmq/+archive/ubuntu/rabbitmq-erlang
.. _`Team RabbitMQ 'Cloudsmith' repo (RPM)`: https://www.rabbitmq.com/docs/install-rpm#cloudsmith
.. _`openstack-kolla COPR`: https://copr.fedorainfracloud.org/coprs/g/openstack-kolla/rabbitmq-erlang/
.. _`openstack-kolla COPR`: https://copr.fedorainfracloud.org/coprs/g/openstack-kolla/rabbitmq-erlang-27/

.. _`Grafana install guide`: https://grafana.com/grafana/download?platform=linux&edition=oss
.. _`MariaDB Community downloads`: https://mariadb.com/downloads/community/
19 changes: 5 additions & 14 deletions docker/base/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ ENV PS1="$(tput bold)($(printenv KOLLA_SERVICE_NAME))$(tput sgr0)[$(id -un)@$(ho
# enables to provide repo overrides at a later date in a simple fashion if we
# desire such functionality. I think we will :)

ENV KOLLA_RPM_OVS_VERSION=3.5 \
KOLLA_RPM_OVN_VERSION=25.03

RUN cat /tmp/kolla_bashrc >> /etc/bashrc \
&& sed -i 's|^\(override_install_langs=.*\)|# \1|' /etc/dnf/dnf.conf

Expand Down Expand Up @@ -142,29 +145,15 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
{% set base_centos_yum_repos_to_enable = [
] %}

# FIXME(hrw): entries not starting with 'centos-' (and 'centos-nfv-ovs') are
# from delorean or rdo-release-* package
# https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241
{% set base_centos_yum_repos_to_disable = [
'centos-ceph-squid',
'centos-nfv-openvswitch',
'centos10-nfv-ovs',
'centos10-rabbitmq',
'centos10-storage',
'epel',
'influxdb',
'opensearch-3.x',
'opensearch-dashboards-3.x',
] %}

{% if base_arch == 'aarch64' %}

{# NOTE(hrw): delorean-deps.repo may force x86-64 repos #}

RUN sed -i -e "s/x86_64/aarch64/g" /etc/yum.repos.d/delorean-deps.repo

{% endif %}

RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}

{%- for repo in base_centos_yum_repos_to_enable | customizable('centos_yum_repos_to_enable') %} && dnf config-manager --enable {{ repo }} {% endfor -%}
Expand Down Expand Up @@ -207,7 +196,9 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
] %}

# Install base packages
{{ macros.enable_extra_repos(['epel']) }}
{{ macros.install_packages( base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_packages") ) }}
{{ macros.disable_extra_repos(['epel']) }}

{# endif for base_package_type rpm #}
{% elif base_package_type == 'deb' %}
Expand Down
4 changes: 2 additions & 2 deletions docker/base/copr-rabbitmq-erlang.repo
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

[copr-rabbitmq-erlang]
name=openstack-kolla COPR with Erlang build for RabbitMQ
baseurl=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang/rhel-$releasever-aarch64/
baseurl=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang-27/rhel-$releasever-aarch64/
gpgcheck=1
enabled=0
gpgkey=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang/pubkey.gpg
gpgkey=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang-27/pubkey.gpg
repo_gpgcheck=0
2 changes: 1 addition & 1 deletion docker/base/sources.list.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ deb mirror://mirrors.ubuntu.com/mirrors.txt noble-security main universe

# We need to add the repo for the updated packages they provide. The main ones
# are qemu, libvirt, and openvswitch.
deb http://ubuntu-cloud.archive.canonical.com/ubuntu noble-updates/epoxy main
deb http://ubuntu-cloud.archive.canonical.com/ubuntu noble-updates/flamingo main

# NOTE(hrw): extra repositories are added into image when they are needed as
# separate files in /etc/apt/sources.list.d/ directory. For that purpose they
Expand Down
2 changes: 1 addition & 1 deletion docker/base/sources.list.ubuntu.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ deb http://ports.ubuntu.com/ noble-backports main universe

# We need to add the repo for the updated packages they provide. The main ones
# are qemu, libvirt, and openvswitch.
deb http://ubuntu-cloud.archive.canonical.com/ubuntu noble-updates/epoxy main
deb http://ubuntu-cloud.archive.canonical.com/ubuntu noble-updates/flamingo main

# NOTE(hrw): extra repositories are added into image when they are needed as
# separate files in /etc/apt/sources.list.d/ directory. For that purpose they
Expand Down
Loading