Skip to content

Commit cee6d6f

Browse files
mnasiadkamnasiadka
authored
Merge pull request #581 from stackhpc/upstream/master-2026-06-22
Synchronise master with upstream
2 parents 49a84a9 + 1f2df4b commit cee6d6f

9 files changed

Lines changed: 29 additions & 32 deletions

File tree

‎ansible/inventory/group_vars/all/network‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,7 @@ internal_net_name: 'internal_net'
2626

2727
# List of names of networks used to provide external network access via
2828
# Neutron.
29-
# Deprecated name: external_net_name
30-
# If external_net_name is defined, external_net_names will default to a list
31-
# containing one item, external_net_name.
32-
external_net_names: >
33-
{{ [external_net_name]
34-
if external_net_name is defined else
35-
['external_net'] }}
29+
external_net_names: ['external_net']
3630

3731
# Name of the network used to expose the public OpenStack API endpoints.
3832
public_net_name: >-

‎ansible/roles/dnf/templates/epel.repo.j2‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
[epel]
2-
name=Extra Packages for Enterprise Linux $releasever - $basearch
3-
baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever/Everything/$basearch
2+
name=Extra Packages for Enterprise Linux $releasever${releasever_minor:+.$releasever_minor} - $basearch
3+
baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever${releasever_minor:+.$releasever_minor}/Everything/$basearch
44
enabled=1
55
gpgcheck=1
66
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-{{ ansible_facts.distribution_major_version }}
77
fastestmirror=0
88

99
[epel-debuginfo]
10-
name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug
11-
baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever/Everything/$basearch/debug
10+
name=Extra Packages for Enterprise Linux $releasever${releasever_minor:+.$releasever_minor} - $basearch - Debug
11+
baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever${releasever_minor:+.$releasever_minor}/Everything/$basearch/debug
1212
enabled=0
1313
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-{{ ansible_facts.distribution_major_version }}
1414
gpgcheck=1
1515
fastestmirror=0
1616

1717
[epel-source]
18-
name=Extra Packages for Enterprise Linux $releasever - $basearch - Source
19-
baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever/Everything/SRPMS
18+
name=Extra Packages for Enterprise Linux $releasever${releasever_minor:+.$releasever_minor} - $basearch - Source
19+
baseurl=http://{{ dnf_epel_mirror_host }}/{{ dnf_epel_mirror_directory }}/$releasever${releasever_minor:+.$releasever_minor}/Everything/SRPMS
2020
enabled=0
2121
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-{{ ansible_facts.distribution_major_version }}
2222
gpgcheck=1

‎dev/dev-vagrant.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ provision_wl_net_name: aio
2828
internal_net_name: aio
2929
public_net_name: aio
3030
tunnel_net_name: aio
31-
external_net_name: aio
31+
external_net_names:
32+
- aio
3233
storage_net_name: aio
3334
storage_mgmt_net_name: aio
3435
inspection_net_name: aio

‎doc/source/configuration/reference/network.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -894,10 +894,9 @@ Public network (``public_net_name``)
894894
Tunnel network (``tunnel_net_name``)
895895
Name of the network used by Neutron to carry tenant overlay network
896896
traffic.
897-
External networks (``external_net_names``, deprecated: ``external_net_name``)
897+
External networks (``external_net_names``)
898898
List of names of networks used to provide external network access via
899-
Neutron. If ``external_net_name`` is defined, ``external_net_names``
900-
defaults to a list containing only that network.
899+
Neutron.
901900
Storage network (``storage_net_name``)
902901
Name of the network used to carry storage data traffic.
903902
Storage management network (``storage_mgmt_net_name``)
@@ -1388,7 +1387,8 @@ We could describe such a network as follows:
13881387
provision_wl_net_name: cloud
13891388
internal_net_name: cloud
13901389
public_net_name: external
1391-
external_net_name: external
1390+
external_net_names:
1391+
- external
13921392
storage_net_name: cloud
13931393
storage_mgmt_net_name: cloud
13941394
inspection_net_name: cloud

‎doc/source/configuration/scenarios/all-in-one/overcloud.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,6 @@ the name of the default controller networks to ``aio``:
132132
133133
# List of names of networks used to provide external network access via
134134
# Neutron.
135-
# Deprecated name: external_net_name
136-
# If external_net_name is defined, external_net_names will default to a list
137-
# containing one item, external_net_name.
138135
#external_net_names:
139136
external_net_names:
140137
- aio

‎etc/kayobe/networks.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828

2929
# List of names of networks used to provide external network access via
3030
# Neutron.
31-
# Deprecated name: external_net_name
32-
# If external_net_name is defined, external_net_names will default to a list
33-
# containing one item, external_net_name.
3431
#external_net_names:
3532

3633
# Name of the network used to expose the public OpenStack API endpoints.

‎releasenotes/notes/fix-epel-repo-paths-rocky-2ba695709fcc6f9c.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes paths to EPEL repositories on Rocky Linux. Previously, they were only
5+
using the major version ``$releasever`` which could point to an
6+
incompatible repository. They now use both major and minor versions, e.g.
7+
``10.2`` instead of ``10``. There is no change on CentOS Stream which uses
8+
only the major version.
9+
`LP#2156407 <https://bugs.launchpad.net/kayobe/+bug/2156407>`__

‎releasenotes/notes/remove-external-net-name-f8a3e0019b54bf95.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
upgrade:
3+
- |
4+
Removes the deprecated configuration variable ``external_net_name``.
5+
Users should use ``external_net_names`` instead.

‎zuul.d/project.yaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@
2929
- kayobe-overcloud-ubuntu-noble
3030
- kayobe-overcloud-ubuntu-noble-podman
3131
- kayobe-overcloud-upgrade-rocky10
32-
# TODO(priteau): Enable when
33-
# https://review.opendev.org/c/openstack/kolla-ansible/+/992397 is
34-
# merged
35-
#- kayobe-overcloud-upgrade-ubuntu-noble
32+
- kayobe-overcloud-upgrade-ubuntu-noble
3633
- kayobe-seed-rocky10
3734
- kayobe-seed-rocky10-podman
3835
- kayobe-seed-ubuntu-noble
@@ -61,10 +58,7 @@
6158
- kayobe-overcloud-ubuntu-noble
6259
- kayobe-overcloud-ubuntu-noble-podman
6360
- kayobe-overcloud-upgrade-rocky10
64-
# TODO(priteau): Enable when
65-
# https://review.opendev.org/c/openstack/kolla-ansible/+/992397 is
66-
# merged
67-
#- kayobe-overcloud-upgrade-ubuntu-noble
61+
- kayobe-overcloud-upgrade-ubuntu-noble
6862
- kayobe-seed-rocky10
6963
- kayobe-seed-rocky10-podman
7064
- kayobe-seed-ubuntu-noble

0 commit comments

Comments
 (0)