Skip to content

Synchronise 2025.1 with upstream #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
priteau merged 4 commits into from
Oct 27, 2025
Merged

Synchronise 2025.1 with upstream #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ec437b
Bump stackhpc.libvirt-host to v1.14.0
priteau Oct 10, 2025
d1b7981
Bump Ceph package repository to Squid
priteau Oct 3, 2025
c778a35
Remove default(omit) from Bifrost inventory template
mmalchuk Oct 17, 2025
6a5514e
Merge "Bump Ceph package repository to Squid" into stable/2025.1
Oct 21, 2025
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
4 changes: 2 additions & 2 deletions ansible/inventory/group_vars/all/bifrost
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ kolla_bifrost_deploy_image_filename: "deployment_image.qcow2"
# UUID of the root filesystem contained within the deployment image.
# See below URL for instructions on how to extract it:
# https://docs.openstack.org/ironic/latest/admin/raid.html#image-requirements
# Default is none.
kolla_bifrost_deploy_image_rootfs:
# Default is an empty string.
kolla_bifrost_deploy_image_rootfs: ''

# Custom cloud-init user-data passed to deploy of the deployment image.
# Default is an empty string.
Expand Down
4 changes: 2 additions & 2 deletions ansible/inventory/group_vars/all/compute
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,8 @@ compute_libvirt_enable_tls: false
compute_libvirt_ceph_repo_install: true

# Ceph package repository release to install on CentOS and Rocky hosts when
# compute_libvirt_ceph_repo_install is true. Default is 'pacific'.
compute_libvirt_ceph_repo_release: pacific
# compute_libvirt_ceph_repo_install is true. Default is 'squid'.
compute_libvirt_ceph_repo_release: squid

###############################################################################
# Compute node swap configuration.
Expand Down
2 changes: 1 addition & 1 deletion ansible/kolla-bifrost-hostvars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
bifrost_hostvars:
addressing_mode: static
deploy_image_filename: "{{ kolla_bifrost_deploy_image_filename }}"
deploy_image_rootfs: "{{ kolla_bifrost_deploy_image_rootfs | default(omit, true) }}"
deploy_image_rootfs: "{{ kolla_bifrost_deploy_image_rootfs }}"
ipv4_interface_mac: "{% if kolla_bifrost_ipv4_interface_mac is defined %}{{ kolla_bifrost_ipv4_interface_mac }}{% else %}{% raw %}{{ extra.pxe_interface_mac | default }}{% endraw %}{% endif %}"
ipv4_address: "{{ admin_oc_net_name | net_ip }}"
ipv4_subnet_mask: "{{ admin_oc_net_name | net_mask }}"
Expand Down
2 changes: 1 addition & 1 deletion doc/source/configuration/reference/hosts.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1237,7 +1237,7 @@ are relevant only when using the libvirt daemon rather than the
Default is ``true``.
``compute_libvirt_ceph_repo_release``
Ceph package repository release to install on CentOS and Rocky hosts when
``compute_libvirt_ceph_repo_install`` is ``true``. Default is ``pacific``.
``compute_libvirt_ceph_repo_install`` is ``true``. Default is ``squid``.

Example: custom libvirtd.conf
-----------------------------
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/bifrost.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
# UUID of the root filesystem contained within the deployment image.
# See below URL for instructions on how to extract it:
# https://docs.openstack.org/ironic/latest/admin/raid.html#image-requirements
# Default is none.
# Default is an empty string.
#kolla_bifrost_deploy_image_rootfs:

# Custom cloud-init user-data passed to deploy of the deployment image.
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/compute.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
#compute_libvirt_ceph_repo_install:

# Ceph package repository release to install on CentOS and Rocky hosts when
# compute_libvirt_ceph_repo_install is true. Default is 'pacific'.
# compute_libvirt_ceph_repo_install is true. Default is 'squid'.
#compute_libvirt_ceph_repo_release:

###############################################################################
Expand Down
5 changes: 5 additions & 0 deletions releasenotes/notes/fix-bifrost-invenory-05f8a92915998f09.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
fixes:
- |
Fixes issue when Bifrost hostvars file incorectly generated by Kayobe.
`LP#2045927 <https://bugs.launchpad.net/kayobe/+bug/2045927>`__
5 changes: 5 additions & 0 deletions releasenotes/notes/host-libvirt-ceph-squid-6c835edd7ac422c8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
upgrade:
- |
Bumps Ceph package repository to Squid. This repository is only configured
when using host libvirt.
5 changes: 5 additions & 0 deletions releasenotes/notes/stackhpc-libvirt-host-el10-0250bdabad776c65.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
upgrade:
- |
Bumps the ``stackhpc.libvirt-host`` role to v1.14.0 which fixes
compatibility with CentOS Stream 10 and Rocky Linux 10.
2 changes: 1 addition & 1 deletion requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ roles:
- src: stackhpc.drac-facts
version: 1.0.0
- src: stackhpc.libvirt-host
version: v1.12.1
version: v1.14.0
- src: stackhpc.libvirt-vm
version: v1.16.3
- src: stackhpc.luks
Expand Down