Merge pull request #204 from stackhpc/upstream-merge

Merge upstream master

Author: Alex-Welsh

etc/kayobe/bifrost.yml

@@ -69,7 +69,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.
@@ -90,7 +90,7 @@
 # Ironic Inspector configuration.
 
 # List of of inspector processing plugins.
-#kolla_bifrost_inspector_processing_hooks:
+#kolla_bifrost_inspector_hooks:
 
 # Which MAC addresses to add as ports during introspection. One of 'all',
 # 'active' or 'pxe'.
@@ -127,9 +127,6 @@
 # Ironic inspector deployment ramdisk location.
 #kolla_bifrost_inspector_deploy_ramdisk:
 
-# Ironic inspector legacy deployment kernel location.
-#kolla_bifrost_inspector_legacy_deploy_kernel:
-
 # Timeout of hardware inspection on overcloud nodes, in seconds. Default is
 # {{ inspector_inspection_timeout }}.
 #kolla_bifrost_inspection_timeout:

etc/kayobe/compute.yml

@@ -2,8 +2,9 @@
 ###############################################################################
 # Compute node configuration.
 
-# User with which to access the computes via SSH during bootstrap, in order
-# to setup the Kayobe user account. Default is {{ os_distribution }}.
+# User with which to access the compute nodes via SSH during bootstrap, in
+# order to setup the Kayobe user account. Default is 'cloud-user' if
+# os_distribution is set to centos, otherwise 'os_distribution'.
 #compute_bootstrap_user:
 
 ###############################################################################
@@ -208,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:
 
 ###############################################################################

etc/kayobe/controllers.yml

@@ -3,7 +3,8 @@
 # Controller node configuration.
 
 # User with which to access the controllers via SSH during bootstrap, in order
-# to setup the Kayobe user account. Default is {{ os_distribution }}.
+# to setup the Kayobe user account. Default is 'cloud-user' if os_distribution
+# is set to centos, otherwise 'os_distribution'.
 #controller_bootstrap_user:
 
 ###############################################################################

etc/kayobe/globals.yml

@@ -49,8 +49,8 @@
 # NOTE: Avoids using Ansible facts to be compatible with gather_facts: false
 os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
 
-# OS release. Valid options are "9-stream" when os_distribution is "centos", or
-# "9" when os_distribution is "rocky", or "noble" when os_distribution is
+# OS release. Valid options are "10-stream" when os_distribution is "centos",
+# "10" when os_distribution is "rocky", or "noble" when os_distribution is
 # "ubuntu".
 # NOTE: Avoids using Ansible facts to be compatible with gather_facts: false
 # yamllint disable-line rule:line-length

etc/kayobe/infra-vms.yml

@@ -31,11 +31,10 @@
 
 # Base image for the infra VM root volume. Default is
 # "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
-# when os_distribution is "ubuntu", or
-# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
-# when os_distribution is "rocky",
-# or
-# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
+# when os_distribution is "ubuntu",
+# "https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2"
+# when os_distribution is "rocky", or
+# "https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-10-latest.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
 
@@ -68,7 +67,8 @@
 # Infrastructure VM node configuration.
 
 # User with which to access the infrastructure vm via SSH during bootstrap, in
-# order to setup the Kayobe user account.
+# order to setup the Kayobe user account. Default is 'cloud-user' if
+# os_distribution is set to centos, otherwise 'os_distribution'.
 #infra_vm_bootstrap_user:
 
 ###############################################################################

etc/kayobe/inspector.yml

@@ -31,32 +31,40 @@
 #inspector_ipa_ramdisk_checksum_algorithm:
 
 ###############################################################################
-# Ironic inspector processing configuration.
+# Ironic inspector processing configuration for the inspector implementation
+# built-in to Ironic.
 
-# List of of default inspector processing plugins.
-#inspector_processing_hooks_default:
+# List of hooks to enable for inspection. Default is [$default_hooks, memory,
+# boot-mode, cpu-capabilities, pci-devices, parse-lldp].
+#inspector_hooks_default:
 
-# List of of additional inspector processing plugins.
-#inspector_processing_hooks_extra:
+# List of extra inspection hooks to enable. Default is an empty list.
+#inspector_hooks_extra:
 
-# List of of additional inspector processing plugins.
-#inspector_processing_hooks:
+# List of of additional inspector hooks to enable. Default is
+# {{ inspector_hooks_default + inspector_hooks_extra }}.
+#inspector_hooks:
+
+###############################################################################
+# Common Ironic Inspector processing configuration.
 
 # Which MAC addresses to add as ports during introspection. One of 'all',
-# 'active' or 'pxe'.
+# 'active' or 'pxe'. Default is 'pxe'.
 #inspector_add_ports:
 
 # Which ports to keep after introspection. One of 'all', 'present', or 'added'.
+# Default is 'added'.
 #inspector_keep_ports:
 
-# Whether to enable discovery of nodes not managed by Ironic.
+# Whether to enable discovery of nodes not managed by Ironic. Default is true.
 #inspector_enable_discovery:
 
-# The Ironic driver with which to register newly discovered nodes.
+# The Ironic driver with which to register newly discovered nodes. Default is
+# 'ipmi'.
 #inspector_discovery_enroll_node_driver:
 
 ###############################################################################
-# Ironic inspector configuration.
+# Ironic inspector introspection rules configuration.
 
 # Ironic inspector option to enable IPMI rules. Set to 'True' by default.
 #inspector_rules_ipmi_enabled:
@@ -90,9 +98,6 @@
 # Redfish CA setting. Set to 'True' by default
 #inspector_rule_var_redfish_verify_ca:
 
-###############################################################################
-# Ironic inspector introspection rules configuration.
-
 # Ironic inspector rule to set IPMI credentials.
 #inspector_rule_ipmi_credentials:
 
@@ -102,9 +107,6 @@
 # Ironic inspector rule to set deployment ramdisk.
 #inspector_rule_deploy_ramdisk:
 
-# Ironic inspector rule to initialise root device hints.
-#inspector_rule_root_hint_init:
-
 # Ironic inspector rule to set serial root device hint.
 #inspector_rule_root_hint_serial:
 
@@ -143,17 +145,6 @@
 # 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: false
-
-# Port on which the inspection data store should listen.
-#inspector_store_port:
-
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/ipa.yml

@@ -19,7 +19,7 @@
 # Version of IPA builder source repository. Default is {{ openstack_branch }}.
 #ipa_builder_source_version:
 
-# List of additional build host packages to install. Default is an empty list.
+# List of additional build host packages to install. Default is [ 'zstd' ].
 #ipa_build_dib_host_packages_extra:
 
 # List of default Diskimage Builder (DIB) elements to use when building IPA
@@ -64,7 +64,7 @@
 # ipa_build_dib_git_elements_default and ipa_build_dib_git_elements_extra.
 #ipa_build_dib_git_elements:
 
-# 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
@@ -80,7 +80,9 @@
 
 # Suffix of upstream Ironic deployment image files. Default is based on
 # {{ openstack_branch }}.
-#ipa_images_upstream_url_suffix:
+# FIXME(priteau): Temporary fix for removal of TinyIPA, until we support CentOS
+# Stream IPA images in CI.
+ipa_images_upstream_url_suffix: -stable-2025.1
 
 # Name of Ironic deployment kernel image to register in Glance.
 #ipa_images_kernel_name:

etc/kayobe/ironic.yml

@@ -94,6 +94,9 @@
 # Name of the Neutron network to use for cleaning.
 #kolla_ironic_cleaning_network:
 
+# Name of the Neutron network to use for inspection.
+#kolla_ironic_inspection_network:
+
 # Name of the Neutron network to use for provisioning.
 #kolla_ironic_provisioning_network:
 
@@ -106,6 +109,14 @@
 # List of kernel parameters to append for baremetal PXE boot.
 #kolla_ironic_pxe_append_params:
 
+# List of default kernel parameters to append for baremetal boot.
+#kolla_ironic_kernel_append_params_default:
+
+# List of additional kernel parameters to append for baremetal boot.
+#kolla_ironic_kernel_append_params_extra:
+
+# List of kernel parameters to append for baremetal boot.
+#kolla_ironic_kernel_append_params:
 ###############################################################################
 # Ironic Node Configuration
 

etc/kayobe/kolla.yml

@@ -86,7 +86,7 @@
 # case Quay.io will be used.
 #kolla_docker_registry:
 
-# Docker namespace to use for Kolla images. Default is 'kolla'.
+# Docker namespace to use for Kolla images. Default is 'openstack.kolla'.
 #kolla_docker_namespace:
 
 # Username to use to access a docker registry. Default is not set, in which
@@ -284,7 +284,6 @@
 
 #kolla_enable_aodh:
 #kolla_enable_barbican:
-#kolla_enable_bifrost:
 #kolla_enable_blazar:
 #kolla_enable_ceilometer:
 #kolla_enable_ceilometer_horizon_policy_file:
@@ -344,15 +343,14 @@
 #kolla_enable_horizon_octavia:
 #kolla_enable_horizon_tacker:
 #kolla_enable_horizon_trove:
-#kolla_enable_horizon_venus:
 #kolla_enable_horizon_watcher:
 #kolla_enable_horizon_zun:
 #kolla_enable_influxdb:
 #kolla_enable_ironic:
 #kolla_enable_ironic_dnsmasq:
-#kolla_enable_ironic_inspector:
 #kolla_enable_ironic_neutron_agent:
 #kolla_enable_ironic_prometheus_exporter:
+#kolla_enable_ironic_pxe_filter:
 #kolla_enable_iscsid:
 #kolla_enable_keepalived:
 #kolla_enable_keystone:
@@ -436,13 +434,12 @@
 #kolla_enable_prometheus_server:
 #kolla_enable_proxysql:
 #kolla_enable_rabbitmq:
-#kolla_enable_redis:
 #kolla_enable_skyline:
 #kolla_enable_tacker:
 #kolla_enable_telegraf:
 #kolla_enable_trove:
 #kolla_enable_trove_singletenant:
-#kolla_enable_venus:
+#kolla_enable_valkey:
 #kolla_enable_watcher:
 #kolla_enable_zun:
 

etc/kayobe/monitoring.yml

@@ -3,7 +3,8 @@
 # Monitoring node configuration.
 
 # User with which to access the monitoring nodes via SSH during bootstrap, in
-# order to setup the Kayobe user account.
+# order to setup the Kayobe user account. Default is 'cloud-user' if
+# os_distribution is set to centos, otherwise 'os_distribution'.
 #monitoring_bootstrap_user:
 
 ###############################################################################