Skip to content

Commit 20c663f

Browse files
mnasiadkaAlex-Welsh
mnasiadka
authored and
Alex-Welsh
committed
Remove RDO/Delorean
RDO has staffing problems and has decided to only support SLURP releases - let's drop reliance on that repository. Change-Id: I56f86a1c5262e3ee2bcbb52cae53c3b2655ed87f Signed-off-by: Michal Nasiadka <[email protected]>
1 parent 711fbe9 commit 20c663f

File tree

21 files changed

+47
-83
lines changed

21 files changed

+47
-83
lines changed

‎doc/source/admin/image-building.rst‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -683,23 +683,16 @@ Red Hat
683683

684684
Kolla allows the operator to build containers using custom repos.
685685
The repos are accepted as a list of comma separated values and can be in the
686-
form of ``.repo``, ``.rpm``, or a url. See examples below.
687-
688-
To use current RDO packages (aka Delorean or DLRN), update ``rpm_setup_config``
689-
in ``kolla-build.conf``:
690-
691-
.. path /etc/kolla/kolla-build.conf
692-
.. code-block:: ini
693-
694-
rpm_setup_config = https://trunk.rdoproject.org/centos8/current/delorean.repo,https://trunk.rdoproject.org/centos8/delorean-deps.repo
686+
form of ``.repo``, ``.rpm``, or a url.
695687

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

699692
.. path kolla/docker/base
700693
.. code-block:: ini
701694
702-
rpm_setup_config = epel.repo,delorean.repo,delorean-deps.repo
695+
rpm_setup_config = epel.repo,https://remote-server.com/your-repo.repo
703696
704697
Debian / Ubuntu
705698
^^^^^^^^^^^^^^^

‎doc/source/contributor/release-management.rst‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,6 @@ R-8: Switch images to current release
152152
.. note:: Debian does not provide repositories for the in-development release
153153
until much later in the cycle.
154154

155-
* [kolla] Switch CentOS images to use the current in-development release
156-
master RDO Delorean repository
157-
158-
* example: https://review.opendev.org/c/openstack/kolla/+/804269
159-
160155
* [kolla] Switch Ubuntu images to use the current in-development release
161156
Ubuntu Cloud Archive (UCA) repository
162157

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

238233
* example: TODO
239234

240-
* [kolla] Switch CentOS images to use the current in-development release
241-
stable RDO Delorean repository
242-
243-
* example: https://review.opendev.org/c/openstack/kolla/+/787339
244-
245235
R-0: Kolla & Kolla Ansible RC1 & stable branch creation
246236
-------------------------------------------------------
247237

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

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

410-
* [kolla] Switch CentOS images to use the CentOS Cloud SIG repository for the
411-
new release
412-
413-
.. note:: This needs to be done on the stable branch.
414-
415-
* example: https://review.opendev.org/c/openstack/kolla/+/788490
416-
417400
* [kolla] Switch Debian images to use the Debian OpenStack repository
418401
for the new release
419402

‎docker/base/Dockerfile.j2‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ ENV PS1="$(tput bold)($(printenv KOLLA_SERVICE_NAME))$(tput sgr0)[$(id -un)@$(ho
3939
# enables to provide repo overrides at a later date in a simple fashion if we
4040
# desire such functionality. I think we will :)
4141

42+
ENV KOLLA_RPM_OVS_VERSION=3.5 \
43+
KOLLA_RPM_OVN_VERSION=25.03
44+
4245
RUN cat /tmp/kolla_bashrc >> /etc/bashrc \
4346
&& sed -i 's|^\(override_install_langs=.*\)|# \1|' /etc/dnf/dnf.conf
4447

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

145-
# FIXME(hrw): entries not starting with 'centos-' (and 'centos-nfv-ovs') are
146-
# from delorean or rdo-release-* package
147-
# https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241
148148
{% set base_centos_yum_repos_to_disable = [
149149
'centos-ceph-squid',
150150
'centos-nfv-openvswitch',
151-
'centos10-nfv-ovs',
152-
'centos10-rabbitmq',
153-
'centos10-storage',
154151
'epel',
155152
'influxdb',
156153
'opensearch-3.x',
157154
'opensearch-dashboards-3.x',
158155
] %}
159156

160-
{% if base_arch == 'aarch64' %}
161-
162-
{# NOTE(hrw): delorean-deps.repo may force x86-64 repos #}
163-
164-
RUN sed -i -e "s/x86_64/aarch64/g" /etc/yum.repos.d/delorean-deps.repo
165-
166-
{% endif %}
167-
168157
RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
169158

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

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

212203
{# endif for base_package_type rpm #}
213204
{% elif base_package_type == 'deb' %}

‎docker/kolla-toolbox/Dockerfile.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1313
{{ macros.configure_user(name='ansible') }}
1414
{{ macros.configure_user(name='rabbitmq') }}
1515

16-
{{ macros.enable_extra_repos(['crb', 'erlang', 'openvswitch', 'rabbitmq']) }}
16+
{{ macros.enable_extra_repos(['crb', 'epel', 'erlang', 'openvswitch', 'rabbitmq']) }}
1717

1818
{% block rabbitmq_apt_preferences %}
1919
{% if base_package_type == 'deb' %}
@@ -34,7 +34,7 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
3434
'make',
3535
'openssh-clients',
3636
'openssl-devel',
37-
'openvswitch',
37+
'openvswitch${KOLLA_RPM_OVS_VERSION}',
3838
'python3',
3939
'python3-devel',
4040
'rabbitmq-server-4.1.*'

‎docker/kuryr/kuryr-libnetwork/Dockerfile.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1212
{% if base_package_type == 'rpm' %}
1313

1414
{% set kuryr_libnetwork_packages = [
15-
'openvswitch'
15+
'openvswitch${KOLLA_RPM_OVS_VERSION}'
1616
] %}
1717

1818
{% elif base_package_type == 'deb' %}

‎docker/manila/manila-base/Dockerfile.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1212

1313
{% if base_package_type == 'rpm' %}
1414

15-
{% set manila_base_packages = ['openvswitch'] %}
15+
{% set manila_base_packages = ['openvswitch${KOLLA_RPM_OVS_VERSION}'] %}
1616

1717
{% elif base_package_type == 'deb' %}
1818

‎docker/neutron/neutron-base/Dockerfile.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
2424
'iputils',
2525
'keepalived',
2626
'net-tools',
27-
'openvswitch',
28-
'python3-openvswitch',
27+
'openvswitch${KOLLA_RPM_OVS_VERSION}',
28+
'python3-openvswitch${KOLLA_RPM_OVS_VERSION}',
2929
'radvd',
3030
'uuid'
3131
] %}

‎docker/nova/nova-base/Dockerfile.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1313
{% if base_package_type == 'rpm' %}
1414

1515
{% set nova_base_packages = [
16-
'openvswitch',
17-
'python3-openvswitch'
16+
'openvswitch${KOLLA_RPM_OVS_VERSION}',
17+
'python3-openvswitch${KOLLA_RPM_OVS_VERSION}'
1818
] %}
1919
{% if base_arch == 'x86_64' %}
2020
{% set nova_base_packages = nova_base_packages + [

‎docker/nova/nova-libvirt/Dockerfile.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
2323
'libvirt-daemon-config-nwfilter',
2424
'libvirt-daemon-driver-nwfilter',
2525
'libvirt-daemon-driver-nodedev',
26-
'openvswitch',
26+
'openvswitch${KOLLA_RPM_OVS_VERSION}',
2727
'qemu-img',
2828
'qemu-kvm',
2929
'swtpm',

‎docker/octavia/octavia-base/Dockerfile.j2‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1010
{{ macros.enable_extra_repos(['openvswitch']) }}
1111
{{ macros.configure_user(name='octavia') }}
1212

13-
{% set octavia_base_packages = [
14-
'python3-openvswitch'
15-
] %}
13+
{% if base_package_type == 'rpm' %}
14+
15+
{% set octavia_base_packages = [
16+
'python3-openvswitch${KOLLA_RPM_OVS_VERSION}'
17+
] %}
18+
19+
{% elif base_package_type == 'deb' %}
20+
21+
{% set octavia_base_packages = [
22+
'python3-openvswitch'
23+
] %}
24+
25+
{% endif %}
1626

1727
{{ macros.install_packages(octavia_base_packages | customizable("packages")) }}
1828

0 commit comments

Comments
 (0)