Skip to content

Commit f22bada

Browse files
Alex-WelshAlex-Welsh
authored
Merge pull request #545 from stackhpc/upstream/master-2026-04-06
Synchronise master with upstream
2 parents 384f75e + 79bffd0 commit f22bada

File tree

16 files changed

+582
-47
lines changed

16 files changed

+582
-47
lines changed

‎ansible/inventory/group_vars/all/dnf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ dnf_custom_repos: {}
4242
# systems only. Default value is 'false'.
4343
dnf_install_epel: false
4444

45+
# Override the state of repositories. Expected to be used with repositories not
46+
# managed by dnf_custom_repos. For example:
47+
# dnf_repo_state_overrides:
48+
# crb: enabled
49+
# Default value is {}.
50+
dnf_repo_state_overrides: {}
51+
4552
###############################################################################
4653
# DNF Automatic configuration.
4754

‎ansible/inventory/group_vars/all/ipa‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ ipa_builder_source_version: "{{ openstack_branch }}"
2323
ipa_build_dib_host_packages_extra: [ 'zstd' ]
2424

2525
# List of default Diskimage Builder (DIB) elements to use when building IPA
26-
# images. Default is ["centos", "dynamic-login", "enable-serial-console",
27-
# "ironic-python-agent-ramdisk"] when os_distribution is "rocky", and
28-
# ["ubuntu", "dynamic-login", "enable-serial-console",
26+
# images. Default is ["rocky-container", "dynamic-login",
27+
# "enable-serial-console", "ironic-python-agent-ramdisk"] when os_distribution
28+
# is "rocky", and ["ubuntu", "dynamic-login", "enable-serial-console",
2929
# "ironic-python-agent-ramdisk"] otherwise.
3030
ipa_build_dib_elements_default:
31-
# TODO(mattcrees): Use {{ os_distribution }} here when Rocky IPA builds work.
32-
- "{{ 'centos' if os_distribution == 'rocky' else os_distribution }}"
31+
- "{{ 'rocky-container' if os_distribution == 'rocky' else os_distribution }}"
3332
- dynamic-login
3433
- enable-serial-console
3534
- ironic-python-agent-ramdisk
35+
- baremetal
3636

3737
# List of additional Diskimage Builder (DIB) elements to use when building IPA
3838
# images. Default is none.
@@ -48,8 +48,9 @@ ipa_build_dib_elements: >
4848
# Dictionary of default environment variables to provide to Diskimage Builder
4949
# (DIB) during IPA image build.
5050
ipa_build_dib_env_default:
51-
# TODO(mattcrees): Use {{ os_release }} here when Rocky IPA builds work.
52-
DIB_RELEASE: "{{ '9-stream' if os_distribution == 'rocky' else os_release }}"
51+
DIB_RELEASE: "{{ os_release }}"
52+
DIB_CONTAINERFILE_RUNTIME: "{{ container_engine }}"
53+
DIB_CONTAINERFILE_RUNTIME_ROOT: "{{ (container_engine == 'podman') | int }}"
5354
DIB_REPOLOCATION_ironic_python_agent: "{{ ipa_build_source_url }}"
5455
DIB_REPOREF_ironic_python_agent: "{{ ipa_build_source_version }}"
5556
DIB_REPOREF_requirements: "{{ ipa_build_source_version }}"
@@ -84,8 +85,10 @@ ipa_build_dib_git_elements_extra: []
8485
ipa_build_dib_git_elements: >-
8586
{{ ipa_build_dib_git_elements_default + ipa_build_dib_git_elements_extra }}
8687

87-
# List of DIB packages to install. Default is empty list.
88-
ipa_build_dib_packages: []
88+
# List of DIB packages to install. Default is ["python3-yaml"] when
89+
# when os_distribution is "rocky", otherwise [].
90+
ipa_build_dib_packages: >-
91+
{{ ["python3-yaml"] if os_distribution == 'rocky' else [] }}
8992

9093
# Upper constraints file for installing packages in the virtual environment
9194
# used for building IPA images. Default is {{ pip_upper_constraints_file }}.

‎ansible/roles/dnf/tasks/local-mirror.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@
99
group: root
1010
mode: 0664
1111
become: True
12+
when: (role_path ~ '/templates/' ~ item ~ '.j2') is exists
1213
loop:
1314
- "{{ repo_file_prefix }}.repo"
1415
- "{{ repo_file_prefix }}-extras.repo"
16+
- "{{ repo_file_prefix }}-addons.repo"
17+
- "{{ repo_file_prefix }}-devel.repo"
1518

1619
- name: Update cache
1720
dnf:

‎ansible/roles/dnf/tasks/main.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,12 @@
1313
when: dnf_use_local_mirror | bool
1414

1515
- import_tasks: custom-repo.yml
16+
17+
- name: Configure repository overrides
18+
become: true
19+
community.general.dnf_config_manager:
20+
name: "{{ item }}"
21+
state: "{{ dnf_repo_state_overrides[item] }}"
22+
# NOTE(wszumski): Ignore repos managed with dnf_custom_repos as enabled state
23+
# is set in definition.
24+
loop: "{{ dnf_repo_state_overrides.keys() | difference(dnf_custom_repos.keys()) }}"

‎ansible/roles/dnf/templates/centos-addons.repo.j2‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
[highavailability]
2+
name=CentOS Stream $releasever - HighAvailability
3+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/HighAvailability/$basearch/os/
4+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
5+
gpgcheck=1
6+
repo_gpgcheck=0
7+
metadata_expire=6h
8+
countme=1
9+
enabled=0
10+
11+
[highavailability-debuginfo]
12+
name=CentOS Stream $releasever - HighAvailability - Debug
13+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/HighAvailability/debug/$basearch/
14+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
15+
gpgcheck=1
16+
repo_gpgcheck=0
17+
metadata_expire=6h
18+
enabled=0
19+
20+
[highavailability-source]
21+
name=CentOS Stream $releasever - HighAvailability - Source
22+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/HighAvailability/source/tree/
23+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
24+
gpgcheck=1
25+
repo_gpgcheck=0
26+
metadata_expire=6h
27+
enabled=0
28+
29+
[nfv]
30+
name=CentOS Stream $releasever - NFV
31+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/NFV/$basearch/os/
32+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
33+
gpgcheck=1
34+
repo_gpgcheck=0
35+
metadata_expire=6h
36+
countme=1
37+
enabled=0
38+
39+
[nfv-debuginfo]
40+
name=CentOS Stream $releasever - NFV - Debug
41+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/NFV/debug/$basearch/
42+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
43+
gpgcheck=1
44+
repo_gpgcheck=0
45+
metadata_expire=6h
46+
enabled=0
47+
48+
[nfv-source]
49+
name=CentOS Stream $releasever - NFV - Source
50+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/NFV/source/tree/
51+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
52+
gpgcheck=1
53+
repo_gpgcheck=0
54+
metadata_expire=6h
55+
enabled=0
56+
57+
[rt]
58+
name=CentOS Stream $releasever - RT
59+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/RT/$basearch/os/
60+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
61+
gpgcheck=1
62+
repo_gpgcheck=0
63+
metadata_expire=6h
64+
countme=1
65+
enabled=0
66+
67+
[rt-debuginfo]
68+
name=CentOS Stream $releasever - RT - Debug
69+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/RT/debug/$basearch/
70+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
71+
gpgcheck=1
72+
repo_gpgcheck=0
73+
metadata_expire=6h
74+
enabled=0
75+
76+
[rt-source]
77+
name=CentOS Stream $releasever - RT - Source
78+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/RT/source/tree/
79+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
80+
gpgcheck=1
81+
repo_gpgcheck=0
82+
metadata_expire=6h
83+
enabled=0
84+
85+
[resilientstorage]
86+
name=CentOS Stream $releasever - ResilientStorage
87+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/ResilientStorage/$basearch/os/
88+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
89+
gpgcheck=1
90+
repo_gpgcheck=0
91+
metadata_expire=6h
92+
countme=1
93+
enabled=0
94+
95+
[resilientstorage-debuginfo]
96+
name=CentOS Stream $releasever - ResilientStorage - Debug
97+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/ResilientStorage/debug/$basearch/
98+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
99+
gpgcheck=1
100+
repo_gpgcheck=0
101+
metadata_expire=6h
102+
enabled=0
103+
104+
[resilientstorage-source]
105+
name=CentOS Stream $releasever - ResilientStorage - Source
106+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/ResilientStorage/source/tree/
107+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
108+
gpgcheck=1
109+
repo_gpgcheck=0
110+
metadata_expire=6h
111+
enabled=0
112+
113+
[extras-common]
114+
name=CentOS Stream $releasever - Extras packages
115+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/SIGs/$stream/extras/$basearch/extras-common/
116+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Extras-SHA512
117+
gpgcheck=1
118+
repo_gpgcheck=0
119+
metadata_expire=6h
120+
countme=1
121+
enabled=1
122+
123+
[extras-common-source]
124+
name=CentOS Stream $releasever - Extras packages - Source
125+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/SIGs/$stream/extras/source/extras-common/
126+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Extras-SHA512
127+
gpgcheck=1
128+
repo_gpgcheck=0
129+
metadata_expire=6h
130+
enabled=0

‎ansible/roles/dnf/templates/centos-extras.repo.j2‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 72 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,83 @@
1-
# centos.repo
2-
#
3-
# The mirrorlist system uses the connecting IP address of the client and the
4-
# update status of each mirror to pick current mirrors that are geographically
5-
# close to the client. You should use this for CentOS updates unless you are
6-
# manually picking other mirrors.
7-
#
8-
# If the mirrorlist does not work for you, you can try the commented out
9-
# baseurl line instead.
10-
111
[baseos]
122
name=CentOS Stream $releasever - BaseOS
133
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/BaseOS/$basearch/os/
4+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
145
gpgcheck=1
6+
repo_gpgcheck=0
7+
metadata_expire=6h
8+
countme=1
159
enabled=1
16-
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
17-
fastestmirror=0
10+
11+
[baseos-debuginfo]
12+
name=CentOS Stream $releasever - BaseOS - Debug
13+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/BaseOS/debug/$basearch/
14+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
15+
gpgcheck=1
16+
repo_gpgcheck=0
17+
metadata_expire=6h
18+
enabled=0
19+
20+
[baseos-source]
21+
name=CentOS Stream $releasever - BaseOS - Source
22+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/BaseOS/source/tree/
23+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
24+
gpgcheck=1
25+
repo_gpgcheck=0
26+
metadata_expire=6h
27+
enabled=0
1828

1929
[appstream]
2030
name=CentOS Stream $releasever - AppStream
2131
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/AppStream/$basearch/os/
32+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
2233
gpgcheck=1
34+
repo_gpgcheck=0
35+
metadata_expire=6h
36+
countme=1
2337
enabled=1
24-
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
25-
fastestmirror=0
38+
39+
[appstream-debuginfo]
40+
name=CentOS Stream $releasever - AppStream - Debug
41+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/AppStream/debug/$basearch/
42+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
43+
gpgcheck=1
44+
repo_gpgcheck=0
45+
metadata_expire=6h
46+
enabled=0
47+
48+
[appstream-source]
49+
name=CentOS Stream $releasever - AppStream - Source
50+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/AppStream/source/tree/
51+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
52+
gpgcheck=1
53+
repo_gpgcheck=0
54+
metadata_expire=6h
55+
enabled=0
56+
57+
[crb]
58+
name=CentOS Stream $releasever - CRB
59+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/CRB/$basearch/os/
60+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
61+
gpgcheck=1
62+
repo_gpgcheck=0
63+
metadata_expire=6h
64+
countme=1
65+
enabled=0
66+
67+
[crb-debuginfo]
68+
name=CentOS Stream $releasever - CRB - Debug
69+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/CRB/debug/$basearch/
70+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
71+
gpgcheck=1
72+
repo_gpgcheck=0
73+
metadata_expire=6h
74+
enabled=0
75+
76+
[crb-source]
77+
name=CentOS Stream $releasever - CRB - Source
78+
baseurl=http://{{ dnf_centos_mirror_host }}/{{ dnf_centos_mirror_directory }}/$stream/CRB/source/tree/
79+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256
80+
gpgcheck=1
81+
repo_gpgcheck=0
82+
metadata_expire=6h
83+
enabled=0

0 commit comments

Comments
 (0)