Merge pull request #1109 from stackhpc/merge-caracal-upstream

Merge upstream Caracal

Author: markgoddard

.gitreview

@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/kayobe-config.git
-defaultbranch=stable/2023.1
+defaultbranch=stable/2024.1

etc/kayobe/bifrost.yml

@@ -28,9 +28,7 @@
 # DIB image OS release. Default is {{ os_release }}.
 #kolla_bifrost_dib_os_release:
 
-# List of default DIB elements. Default is ["disable-selinux",
-# "enable-serial-console", "vm"] when os_distribution is "centos", or
-# ["enable-serial-console", "vm"] otherwise.
+# List of default DIB elements. Default is ["enable-serial-console", "vm"].
 #kolla_bifrost_dib_elements_default:
 
 # List of additional DIB elements. Default is none.
@@ -71,6 +69,10 @@
 # Default is none.
 #kolla_bifrost_deploy_image_rootfs:
 
+# Custom cloud-init user-data passed to deploy of the deployment image.
+# Default is an empty string.
+#kolla_bifrost_deploy_image_user_data_content:
+
 ###############################################################################
 # Ironic configuration.
 
@@ -106,6 +108,12 @@
 # Ironic inspector IPMI password to set.
 #kolla_bifrost_inspector_ipmi_password:
 
+# Ironic inspector Redfish username to set.
+#kolla_bifrost_inspector_redfish_username:
+
+# Ironic inspector Redfish password to set.
+#kolla_bifrost_inspector_redfish_password:
+
 # Ironic inspector network interface name on which to check for an LLDP switch
 # port description to use as the node's name.
 #kolla_bifrost_inspector_lldp_switch_port_interface:

etc/kayobe/compute.yml

@@ -76,10 +76,8 @@
 #compute_lvm_groups_extra:
 
 # Whether a 'data' LVM volume group should exist on compute hosts. By default
-# this contains a 'docker-volumes' logical volume for Docker volume storage. It
-# will also be used for Docker container and image storage if
-# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
-# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
+# this contains a 'docker-volumes' logical volume for Docker volume storage.
+# Default is false.
 #compute_lvm_group_data_enabled:
 
 # Compute LVM volume group for data. See mrlesmithjr.manage_lvm role for
@@ -180,7 +178,7 @@
 #compute_qemu_conf:
 
 # Whether to enable libvirt SASL authentication. Default is true.
-#compute_libvirt_enable_sasl: true
+#compute_libvirt_enable_sasl:
 
 # libvirt SASL password. Default is unset.
 #compute_libvirt_sasl_password:

etc/kayobe/controllers.yml

@@ -6,6 +6,25 @@
 # to setup the Kayobe user account. Default is {{ os_distribution }}.
 #controller_bootstrap_user:
 
+###############################################################################
+# Controller groups.
+
+# Ansible inventory group in which Ironic conductor services are deployed.
+# Default is 'controllers'.
+#controller_ironic_conductor_group:
+
+# Ansible inventory group in which Ironic inspector services are deployed.
+# Default is 'controllers'.
+#controller_ironic_inspector_group:
+
+# Ansible inventory group in which control plane load balancer services are
+# deployed. Default is 'network'.
+#controller_loadbalancer_group:
+
+# Ansible inventory group in which network data plane services are deployed.
+# Default is 'network'.
+#controller_network_group:
+
 ###############################################################################
 # Controller network interface configuration.
 
@@ -86,9 +105,8 @@
 
 # Whether a 'data' LVM volume group should exist on controller hosts. By
 # default this contains a 'docker-volumes' logical volume for Docker volume
-# storage. It will also be used for Docker container and image storage if
-# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
-# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
+# storage.
+# Default is false.
 #controller_lvm_group_data_enabled:
 
 # Controller LVM volume group for data. See mrlesmithjr.manage_lvm role for

etc/kayobe/globals.yml

@@ -64,6 +64,10 @@
 # to not specify a gather subset.
 #kayobe_ansible_setup_gather_subset:
 
+# Global maximum failure percentage. By default this is undefined, which is
+# equivalent to a value of 100.
+#kayobe_max_fail_percentage:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/grafana.yml

@@ -2,8 +2,7 @@
 ###############################################################################
 # Grafana configuration.
 
-# Grafana local admin user name. If you are deploying Monasca Grafana this
-# should not conflict with an OpenStack user name.
+# Grafana local admin user name.
 #grafana_local_admin_user_name:
 
 ###############################################################################

etc/kayobe/infra-vms.yml

@@ -106,9 +106,7 @@
 
 # Whether a 'data' LVM volume group should exist on the infrastructure vm. By
 # default this contains a 'docker-volumes' logical volume for Docker volume
-# storage. It will also be used for Docker container and image storage if
-# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
-# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
+# storage. Default is false.
 #infra_vm_lvm_group_data_enabled:
 
 # Infrastructure VM LVM volume group for data. See mrlesmithjr.manage_lvm role

etc/kayobe/inspector.yml

@@ -58,6 +58,9 @@
 ###############################################################################
 # Ironic inspector configuration.
 
+# Ironic inspector option to enable IPMI rules. Set to 'True' by default.
+#inspector_rules_ipmi_enabled:
+
 # Ironic inspector IPMI username to set.
 #inspector_ipmi_username:
 
@@ -72,6 +75,21 @@
 # check for an LLDP switch port description to use as the node's name.
 #inspector_lldp_switch_port_interface_map:
 
+# Ironic inspector uses IPMI by default enroll the baremetal nodes, however it
+# is possible to use Redfish instead. To do that enable Redfish and make sure
+# all of the necessary variables below have been properly set.
+# Enable inspector Redfish rules. Set to 'False' by default.
+#inspector_rules_redfish_enabled:
+
+# Ironic inspector Redfish username to set.
+#inspector_redfish_username:
+
+# Ironic inspector Redfish password to set.
+#inspector_redfish_password:
+
+# Redfish CA setting. Set to 'True' by default
+#inspector_rule_var_redfish_verify_ca:
+
 ###############################################################################
 # Ironic inspector introspection rules configuration.
 

etc/kayobe/inventory/groups

@@ -54,8 +54,11 @@ controllers
 [storage]
 # Empty group to provide declaration of storage group.
 
-[compute]
-# Empty group to provide declaration of compute group.
+[compute-vgpu]
+# Empty group to provide declaration of compute-vgpu group.
+
+[compute:children]
+compute-vgpu
 
 [overcloud:children]
 controllers
@@ -64,6 +67,14 @@ monitoring
 storage
 compute
 
+###############################################################################
+# Feature control groups
+[vgpu:children]
+compute-vgpu
+
+[iommu:children]
+vgpu
+
 ###############################################################################
 # Service groups.
 

etc/kayobe/ipa.yml

@@ -24,7 +24,8 @@
 
 # List of default Diskimage Builder (DIB) elements to use when building IPA
 # images. Default is ["centos", "enable-serial-console",
-# "ironic-python-agent-ramdisk"].
+# "ironic-python-agent-ramdisk"] when os_distribution is "rocky", and
+# ["ubuntu", "enable-serial-console", "ironic-python-agent-ramdisk"] otherwise.
 #ipa_build_dib_elements_default:
 
 # List of additional Diskimage Builder (DIB) elements to use when building IPA
@@ -49,15 +50,16 @@
 #ipa_build_dib_env:
 
 # List of default git repositories containing Diskimage Builder (DIB) elements.
-# See stackhpc.os-images role for usage. Default is one item for IPA builder.
+# See stackhpc.openstack.os_images role for usage.
+# Default is one item for IPA builder.
 #ipa_build_dib_git_elements_default:
 
 # List of additional git repositories containing Diskimage Builder (DIB)
-# elements. See stackhpc.os-images role for usage. Default is empty.
+# elements. See stackhpc.openstack.os_images role for usage. Default is empty.
 #ipa_build_dib_git_elements_extra:
 
 # List of git repositories containing Diskimage Builder (DIB) elements. See
-# stackhpc.os-images role for usage. Default is a combination of
+# stackhpc.openstack.os_images role for usage. Default is a combination of
 # ipa_build_dib_git_elements_default and ipa_build_dib_git_elements_extra.
 #ipa_build_dib_git_elements: