diff --git a/ansible/inventory/group_vars/all/bifrost b/ansible/inventory/group_vars/all/bifrost index 4d2e41aec..fe14cfc10 100644 --- a/ansible/inventory/group_vars/all/bifrost +++ b/ansible/inventory/group_vars/all/bifrost @@ -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. diff --git a/ansible/inventory/group_vars/all/compute b/ansible/inventory/group_vars/all/compute index 30878e069..1803098cc 100644 --- a/ansible/inventory/group_vars/all/compute +++ b/ansible/inventory/group_vars/all/compute @@ -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. diff --git a/ansible/kolla-bifrost-hostvars.yml b/ansible/kolla-bifrost-hostvars.yml index ce330fe15..d560e4d0e 100644 --- a/ansible/kolla-bifrost-hostvars.yml +++ b/ansible/kolla-bifrost-hostvars.yml @@ -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 }}" diff --git a/doc/source/configuration/reference/hosts.rst b/doc/source/configuration/reference/hosts.rst index cec5f8999..2dab55854 100644 --- a/doc/source/configuration/reference/hosts.rst +++ b/doc/source/configuration/reference/hosts.rst @@ -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 ----------------------------- diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml index 741bbd8ca..5ec684c3d 100644 --- a/etc/kayobe/bifrost.yml +++ b/etc/kayobe/bifrost.yml @@ -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. diff --git a/etc/kayobe/compute.yml b/etc/kayobe/compute.yml index f27522349..383abd16f 100644 --- a/etc/kayobe/compute.yml +++ b/etc/kayobe/compute.yml @@ -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: ############################################################################### diff --git a/releasenotes/notes/fix-bifrost-invenory-05f8a92915998f09.yaml b/releasenotes/notes/fix-bifrost-invenory-05f8a92915998f09.yaml new file mode 100644 index 000000000..c616a971a --- /dev/null +++ b/releasenotes/notes/fix-bifrost-invenory-05f8a92915998f09.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes issue when Bifrost hostvars file incorectly generated by Kayobe. + `LP#2045927 `__ diff --git a/releasenotes/notes/host-libvirt-ceph-squid-6c835edd7ac422c8.yaml b/releasenotes/notes/host-libvirt-ceph-squid-6c835edd7ac422c8.yaml new file mode 100644 index 000000000..afb2a819a --- /dev/null +++ b/releasenotes/notes/host-libvirt-ceph-squid-6c835edd7ac422c8.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Bumps Ceph package repository to Squid. This repository is only configured + when using host libvirt. diff --git a/releasenotes/notes/stackhpc-libvirt-host-el10-0250bdabad776c65.yaml b/releasenotes/notes/stackhpc-libvirt-host-el10-0250bdabad776c65.yaml new file mode 100644 index 000000000..646925cfc --- /dev/null +++ b/releasenotes/notes/stackhpc-libvirt-host-el10-0250bdabad776c65.yaml @@ -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. diff --git a/requirements.yml b/requirements.yml index 67a66db6c..1ae9c5b9e 100644 --- a/requirements.yml +++ b/requirements.yml @@ -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