Synchronise master with upstream

ansible/inventory/group_vars/all/bifrost

@@ -68,8 +68,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.

ansible/inventory/group_vars/all/inspector

@@ -395,13 +395,3 @@ inspector_rules: "{{ inspector_rules_default + inspector_rules_extra + (inspecto
 # applied.
 inspector_dell_switch_lldp_workaround_group:
 
-###############################################################################
-# Inspection store configuration.
-# The inspection store provides a Swift-like service for storing inspection
-# data which may be useful in environments without Swift.
-
-# Whether the inspection data store is enabled.
-inspector_store_enabled: "{{ kolla_enable_ironic_inspector | bool and not kolla_enable_swift | bool }}"
-
-# Port on which the inspection data store should listen.
-inspector_store_port: 8080

ansible/inventory/group_vars/all/ipa

@@ -20,7 +20,7 @@ ipa_builder_source_url: "https://opendev.org/openstack/ironic-python-agent-build
 ipa_builder_source_version: "{{ openstack_branch }}"
 
 # List of additional build host packages to install.
-ipa_build_dib_host_packages_extra: []
+ipa_build_dib_host_packages_extra: [ 'zstd' ]
 
 # List of default Diskimage Builder (DIB) elements to use when building IPA
 # images. Default is ["centos", "dynamic-login", "enable-serial-console",
@@ -53,6 +53,7 @@ ipa_build_dib_env_default:
   DIB_REPOLOCATION_ironic_python_agent: "{{ ipa_build_source_url }}"
   DIB_REPOREF_ironic_python_agent: "{{ ipa_build_source_version }}"
   DIB_REPOREF_requirements: "{{ ipa_build_source_version }}"
+  DIB_IPA_COMPRESS_CMD: 'zstd -19'
 
 # Dictionary of additional environment variables to provide to Diskimage
 # Builder (DIB) during IPA image build.
@@ -83,7 +84,7 @@ ipa_build_dib_git_elements_extra: []
 ipa_build_dib_git_elements: >-
   {{ ipa_build_dib_git_elements_default + ipa_build_dib_git_elements_extra }}
 
-# List of DIB packages to install. Default is none.
+# List of DIB packages to install. Default is empty list.
 ipa_build_dib_packages: []
 
 # Upper constraints file for installing packages in the virtual environment

ansible/inventory/group_vars/all/ironic

@@ -101,20 +101,27 @@ kolla_ironic_inspection_network: "{{ kolla_ironic_provisioning_network if inspec
 kolla_ironic_provisioning_network: 'provision-net'
 
 # List of default kernel parameters to append for baremetal PXE boot.
-kolla_ironic_pxe_append_params_default:
+kolla_ironic_pxe_append_params_default: "{{ kolla_ironic_kernel_append_params_default }}"
+
+# List of additional kernel parameters to append for baremetal PXE boot.
+kolla_ironic_pxe_append_params_extra: "{{ kolla_ironic_kernel_append_params_extra }}"
+
+# List of kernel parameters to append for baremetal PXE boot.
+kolla_ironic_pxe_append_params: "{{ kolla_ironic_pxe_append_params_default + kolla_ironic_pxe_append_params_extra }}"
+
+# List of default kernel parameters to append for baremetal boot.
+kolla_ironic_kernel_append_params_default:
   - nofb
   - nomodeset
   - vga=normal
   - console=tty0
   - console=ttyS0,115200n8
 
-# List of additional kernel parameters to append for baremetal PXE boot.
-kolla_ironic_pxe_append_params_extra: []
+# List of additional kernel parameters to append for baremetal boot.
+kolla_ironic_kernel_append_params_extra: []
 
-# List of kernel parameters to append for baremetal PXE boot.
-kolla_ironic_pxe_append_params: >
-  {{ kolla_ironic_pxe_append_params_default +
-     kolla_ironic_pxe_append_params_extra }}
+# List of kernel parameters to append for baremetal boot.
+kolla_ironic_kernel_append_params: "{{ kolla_ironic_kernel_append_params_default + kolla_ironic_kernel_append_params_extra }}"
 
 ###############################################################################
 # Ironic Node Configuration

ansible/inventory/group_vars/all/kolla

@@ -63,9 +63,9 @@ kolla_base_distro: "{{ os_distribution }}"
 # Kolla base container image distribution version default map.
 # Defines default versions for each distribution.
 kolla_base_distro_version_default_map: {
-  "centos": "stream9",
+  "centos": "stream10",
   "debian": "bookworm",
-  "rocky": "9",
+  "rocky": "10",
   "ubuntu": "noble",
 }
 
@@ -208,7 +208,7 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_multipathd | bool }}"
   - regex: "neutron-\\(server\\|metadata-agent\\)"
     enabled: "{{ kolla_enable_neutron | bool }}"
-  - regex: "neutron-\\(dhcp\\|l3\\|linuxbridge\\|openvswitch\\)-agent"
+  - regex: "neutron-\\(dhcp\\|l3\\|openvswitch\\)-agent"
     enabled: "{{ kolla_build_neutron_ovs | default(kolla_enable_neutron | bool and not kolla_enable_ovn | bool) }}"
   - regex: neutron-bgp-dragent
     enabled: "{{ kolla_enable_neutron_bgp_dragent | bool }}"

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 }}"

ansible/kolla-openstack.yml

@@ -136,12 +136,6 @@
       kolla_inspector_keep_ports: "{{ inspector_keep_ports }}"
       kolla_inspector_enable_discovery: "{{ inspector_enable_discovery }}"
       kolla_inspector_discovery_enroll_node_driver: "{{ inspector_discovery_enroll_node_driver }}"
-      # Ironic inspector swift store configuration. Currently only supports the
-      # 'fake' inspection store.
-      kolla_inspector_enable_swift: "{{ inspector_store_enabled }}"
-      kolla_inspector_swift_auth:
-        auth_type: none
-        endpoint_override: "http://{% raw %}{{ api_interface_address }}{% endraw %}:{{ inspector_store_port }}"
       kolla_inspector_ipa_host: "{{ groups['controllers_with_ironic_enabled_True'][0] }}"
       kolla_openstack_custom_config_paths_extra_multi_env_static:
         - "{{ kayobe_config_path }}"

ansible/overcloud-extras.yml

@@ -8,5 +8,4 @@
 # action: One of deploy, destroy, pull, reconfigure, upgrade
 
 - import_playbook: docker-registry.yml
-- import_playbook: inspection-store.yml
 - import_playbook: opensm.yml