Skip to content

Commit 9c8c61b

Browse files
authored
Merge pull request #85 from stackhpc/upstream/master-2025-09-15
Synchronise master with upstream
2 parents fbdaff8 + f587a56 commit 9c8c61b

File tree

11 files changed

+90
-3
lines changed

11 files changed

+90
-3
lines changed

doc/source/install/index.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ Supported operating systems
1414

1515
Full support (fully tested in the CI, no known or potential issues):
1616

17+
* CentOS Stream 10
18+
19+
.. note::
20+
RHEL 10 and derivatives are assumed to work but not tested explicitly.
21+
1722
* Ubuntu 22.04 "Jammy" and 24.04 "Noble"
1823
* Debian 12 "Bookworm"
1924

playbooks/roles/bifrost-create-vm-nodes/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The following packages are required and ensured to be present:
1010
- libvirt-bin
1111
- qemu-utils
1212
- qemu-kvm
13-
- sgabios
13+
- sgabios (except on CentOS Stream 10 / Rocky Linux 10)
1414

1515

1616
Warning

playbooks/roles/bifrost-create-vm-nodes/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
- name: "Install required packages"
4040
package:
41-
name: "{{ required_packages }}"
41+
name: "{{ required_packages | select | list }}"
4242
state: present
4343

4444
- name: ensure installation root folder exists

playbooks/roles/bifrost-create-vm-nodes/vars/redhat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ required_packages:
66
- qemu-img
77
- kernel-tools
88
- qemu-kvm
9-
- sgabios-bin
9+
- "{{ 'sgabios-bin' if ansible_distribution_version | int == 9 else '' }}"
1010
- libvirt
1111
- libvirt-client
1212
- libvirt-daemon
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes support for CentOS Stream 10 and Rocky Linux 10 by removing the
5+
dependency on ``sgabios`` for these distributions.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
features:
3+
- |
4+
Adds official support for running Bifrost on CentOS Stream 10.

releasenotes/source/2025.2.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
===========================
2+
2025.2 Series Release Notes
3+
===========================
4+
5+
.. release-notes::
6+
:branch: stable/2025.2

releasenotes/source/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Bifrost Release Notes
66
:maxdepth: 1
77

88
unreleased
9+
2025.2
910
2025.1
1011
2024.2
1112
2024.1

scripts/install-deps.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ fi
88

99
declare -A PKG_MAP
1010

11+
SCRIPT_HOME="$(cd "$(dirname "$0")" && pwd)"
12+
export BIFROST_HOME=$SCRIPT_HOME/..
13+
1114
# NOTE(rpittau): we need a stable recent version of pip to avoid issues with
1215
# the cryptography package.
1316
PIP_MIN_REQ="22.3.1"

zuul.d/bifrost-jobs.yaml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
- nodeset:
2+
name: bifrost-centos-10-stream
3+
nodes:
4+
- name: primary
5+
label: centos-10-stream-8GB
6+
17
- job:
28
name: bifrost-base
39
parent: base
@@ -44,6 +50,11 @@
4450
parent: bifrost-integration-dhcp
4551
nodeset: ubuntu-jammy
4652

53+
- job:
54+
name: bifrost-integration-dhcp-centos-10
55+
parent: bifrost-integration-dhcp
56+
nodeset: bifrost-centos-10-stream
57+
4758
- job:
4859
name: bifrost-integration-dibipa-debian
4960
parent: bifrost-integration
@@ -59,6 +70,11 @@
5970
parent: bifrost-integration-dibipa-debian
6071
nodeset: ubuntu-jammy
6172

73+
- job:
74+
name: bifrost-integration-dibipa-debian-centos-10
75+
parent: bifrost-integration-dibipa-debian
76+
nodeset: bifrost-centos-10-stream
77+
6278
- job:
6379
name: bifrost-integration-tinyipa
6480
parent: bifrost-base
@@ -137,6 +153,29 @@
137153
enable_grub_network_boot: true
138154
test_driver: redfish
139155

156+
- job:
157+
name: bifrost-integration-tinyipa-centos-10
158+
parent: bifrost-integration-tinyipa
159+
nodeset: bifrost-centos-10-stream
160+
161+
- job:
162+
name: bifrost-integration-tinyipa-keystone-centos-10
163+
parent: bifrost-integration-tinyipa-centos-10
164+
required-projects:
165+
- openstack/keystone
166+
- openstack/ironic-prometheus-exporter
167+
vars:
168+
enable_keystone: true
169+
enable_tls: true
170+
test_driver: redfish
171+
enable_prometheus_exporter: true
172+
173+
- job:
174+
name: bifrost-integration-inspector-centos-10
175+
parent: bifrost-integration-tinyipa-centos-10
176+
vars:
177+
use_inspector: true
178+
140179
- job:
141180
name: bifrost-integration-tinyipa-debian-bullseye
142181
parent: bifrost-integration-tinyipa
@@ -176,6 +215,16 @@
176215
parent: bifrost-upgrade
177216
nodeset: ubuntu-jammy
178217

218+
- job:
219+
name: bifrost-upgrade-keystone-centos-10
220+
parent: bifrost-upgrade
221+
nodeset: bifrost-centos-10-stream
222+
required-projects:
223+
- openstack/keystone
224+
vars:
225+
enable_keystone: true
226+
noauth_mode: false
227+
179228
- job:
180229
name: bifrost-upgrade-keystone-ubuntu-noble
181230
parent: bifrost-upgrade

0 commit comments

Comments
 (0)