[release] Synchronise with kayobe for 2024.1

Change-Id: I58d25ddc14d742d9ed79db4d5cd2d20a3e2b791a
This commit is contained in:
Pierre Riteau 2024-05-30 09:24:09 +02:00
parent 04a6f86b25
commit 23253cf0cf
13 changed files with 63 additions and 46 deletions

View File

@ -46,6 +46,17 @@
# Default is false. # Default is false.
#apt_disable_sources_list: #apt_disable_sources_list:
# List of Apt auth configurations. Each item is a dict with the following keys:
# * machine: 'machine' entry in the auth file
# * login: 'login' entry in the auth file
# * password: 'password' entry in the auth file
# * filename: Name of a file in which to store the auth configuration. The
# extension should be '.conf'.
# * filename: Name of a file in /etc/apt/auth.conf.d in which to store
# the auth configuration. The extension should be ``.conf``.
# Default is an empty list.
#apt_auth:
############################################################################### ###############################################################################
# Dummy variable to allow Ansible to accept this file. # Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes workaround_ansible_issue_8743: yes

View File

@ -108,6 +108,12 @@
# Ironic inspector IPMI password to set. # Ironic inspector IPMI password to set.
#kolla_bifrost_inspector_ipmi_password: #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 # Ironic inspector network interface name on which to check for an LLDP switch
# port description to use as the node's name. # port description to use as the node's name.
#kolla_bifrost_inspector_lldp_switch_port_interface: #kolla_bifrost_inspector_lldp_switch_port_interface:

View File

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

View File

@ -105,9 +105,8 @@
# Whether a 'data' LVM volume group should exist on controller hosts. By # Whether a 'data' LVM volume group should exist on controller hosts. By
# default this contains a 'docker-volumes' logical volume for Docker volume # default this contains a 'docker-volumes' logical volume for Docker volume
# storage. It will also be used for Docker container and image storage if # storage.
# 'docker_storage_driver' is set to 'devicemapper'. Default is true if # Default is false.
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
#controller_lvm_group_data_enabled: #controller_lvm_group_data_enabled:
# Controller LVM volume group for data. See mrlesmithjr.manage_lvm role for # Controller LVM volume group for data. See mrlesmithjr.manage_lvm role for

View File

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

View File

@ -58,6 +58,9 @@
############################################################################### ###############################################################################
# Ironic inspector configuration. # 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. # Ironic inspector IPMI username to set.
#inspector_ipmi_username: #inspector_ipmi_username:
@ -72,6 +75,21 @@
# check for an LLDP switch port description to use as the node's name. # check for an LLDP switch port description to use as the node's name.
#inspector_lldp_switch_port_interface_map: #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. # Ironic inspector introspection rules configuration.

View File

@ -50,15 +50,16 @@
#ipa_build_dib_env: #ipa_build_dib_env:
# List of default git repositories containing Diskimage Builder (DIB) elements. # 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: #ipa_build_dib_git_elements_default:
# List of additional git repositories containing Diskimage Builder (DIB) # 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: #ipa_build_dib_git_elements_extra:
# List of git repositories containing Diskimage Builder (DIB) elements. See # 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_default and ipa_build_dib_git_elements_extra.
#ipa_build_dib_git_elements: #ipa_build_dib_git_elements:

View File

@ -306,7 +306,7 @@
#kolla_enable_external_api_firewalld: #kolla_enable_external_api_firewalld:
#kolla_enable_external_mariadb_load_balancer: #kolla_enable_external_mariadb_load_balancer:
#kolla_enable_fluentd: #kolla_enable_fluentd:
#kolla_enable_freezer: #kolla_enable_fluentd_systemd:
#kolla_enable_glance: #kolla_enable_glance:
#kolla_enable_glance_horizon_policy_file: #kolla_enable_glance_horizon_policy_file:
#kolla_enable_glance_image_cache: #kolla_enable_glance_image_cache:
@ -323,29 +323,23 @@
#kolla_enable_horizon_blazar: #kolla_enable_horizon_blazar:
#kolla_enable_horizon_cloudkitty: #kolla_enable_horizon_cloudkitty:
#kolla_enable_horizon_designate: #kolla_enable_horizon_designate:
#kolla_enable_horizon_freezer: #kolla_enable_horizon_fwaas:
#kolla_enable_horizon_heat: #kolla_enable_horizon_heat:
#kolla_enable_horizon_ironic: #kolla_enable_horizon_ironic:
#kolla_enable_horizon_magnum: #kolla_enable_horizon_magnum:
#kolla_enable_horizon_manila: #kolla_enable_horizon_manila:
#kolla_enable_horizon_masakari: #kolla_enable_horizon_masakari:
#kolla_enable_horizon_mistral: #kolla_enable_horizon_mistral:
#kolla_enable_horizon_murano:
#kolla_enable_horizon_neutron_vpnaas: #kolla_enable_horizon_neutron_vpnaas:
#kolla_enable_horizon_octavia: #kolla_enable_horizon_octavia:
#kolla_enable_horizon_sahara:
#kolla_enable_horizon_senlin:
#kolla_enable_horizon_solum:
#kolla_enable_horizon_tacker: #kolla_enable_horizon_tacker:
#kolla_enable_horizon_trove: #kolla_enable_horizon_trove:
#kolla_enable_horizon_vitrage:
#kolla_enable_horizon_watcher: #kolla_enable_horizon_watcher:
#kolla_enable_horizon_zun: #kolla_enable_horizon_zun:
#kolla_enable_influxdb: #kolla_enable_influxdb:
#kolla_enable_ironic: #kolla_enable_ironic:
#kolla_enable_ironic_neutron_agent: #kolla_enable_ironic_neutron_agent:
#kolla_enable_ironic_prometheus_exporter: #kolla_enable_ironic_prometheus_exporter:
#kolla_enable_ironic_pxe_uefi:
#kolla_enable_iscsid: #kolla_enable_iscsid:
#kolla_enable_keepalived: #kolla_enable_keepalived:
#kolla_enable_keystone: #kolla_enable_keystone:
@ -369,11 +363,11 @@
#kolla_enable_memcached: #kolla_enable_memcached:
#kolla_enable_mistral: #kolla_enable_mistral:
#kolla_enable_multipathd: #kolla_enable_multipathd:
#kolla_enable_murano:
#kolla_enable_neutron: #kolla_enable_neutron:
#kolla_enable_neutron_agent_ha: #kolla_enable_neutron_agent_ha:
#kolla_enable_neutron_bgp_dragent: #kolla_enable_neutron_bgp_dragent:
#kolla_enable_neutron_dvr: #kolla_enable_neutron_dvr:
#kolla_enable_neutron_fwaas:
#kolla_enable_neutron_horizon_policy_file: #kolla_enable_neutron_horizon_policy_file:
#kolla_enable_neutron_infoblox_ipam_agent: #kolla_enable_neutron_infoblox_ipam_agent:
#kolla_enable_neutron_metering: #kolla_enable_neutron_metering:
@ -385,6 +379,7 @@
#kolla_enable_neutron_segments: #kolla_enable_neutron_segments:
#kolla_enable_neutron_sfc: #kolla_enable_neutron_sfc:
#kolla_enable_neutron_sriov: #kolla_enable_neutron_sriov:
#kolla_enable_neutron_taas:
#kolla_enable_neutron_trunk: #kolla_enable_neutron_trunk:
#kolla_enable_neutron_vpnaas: #kolla_enable_neutron_vpnaas:
#kolla_enable_nova: #kolla_enable_nova:
@ -402,7 +397,6 @@
#kolla_enable_openstack_core: #kolla_enable_openstack_core:
#kolla_enable_openvswitch: #kolla_enable_openvswitch:
#kolla_enable_osprofiler: #kolla_enable_osprofiler:
#kolla_enable_outward_rabbitmq:
#kolla_enable_ovn: #kolla_enable_ovn:
#kolla_enable_ovs_dpdk: #kolla_enable_ovs_dpdk:
#kolla_enable_placement: #kolla_enable_placement:
@ -428,10 +422,7 @@
#kolla_enable_proxysql: #kolla_enable_proxysql:
#kolla_enable_rabbitmq: #kolla_enable_rabbitmq:
#kolla_enable_redis: #kolla_enable_redis:
#kolla_enable_sahara:
#kolla_enable_senlin:
#kolla_enable_skyline: #kolla_enable_skyline:
#kolla_enable_solum:
#kolla_enable_swift: #kolla_enable_swift:
#kolla_enable_swift_recon: #kolla_enable_swift_recon:
#kolla_enable_swift_s3api: #kolla_enable_swift_s3api:
@ -440,8 +431,6 @@
#kolla_enable_trove: #kolla_enable_trove:
#kolla_enable_trove_singletenant: #kolla_enable_trove_singletenant:
#kolla_enable_venus: #kolla_enable_venus:
#kolla_enable_vitrage:
#kolla_enable_vitrage_prometheus_datasource:
#kolla_enable_watcher: #kolla_enable_watcher:
#kolla_enable_zun: #kolla_enable_zun:

View File

@ -69,7 +69,7 @@
# #
# example_cidr: 10.0.0.0/24 # example_cidr: 10.0.0.0/24
# example_allocation_pool_start: 10.0.0.2 # example_allocation_pool_start: 10.0.0.2
# example_allocation_pool_start: 10.0.0.254 # example_allocation_pool_end: 10.0.0.254
# example_gateway: 10.0.0.1 # example_gateway: 10.0.0.1
# example_vlan: 42 # example_vlan: 42
# #

View File

@ -2,10 +2,10 @@
############################################################################### ###############################################################################
# OpenStack release configuration. # OpenStack release configuration.
# Name of the current OpenStack release. Default is "2023.2". # Name of the current OpenStack release. Default is "2024.1".
#openstack_release: #openstack_release:
# Name of the current OpenStack branch. Default is "stable/2023.2". # Name of the current OpenStack branch. Default is "stable/2024.1".
#openstack_branch: #openstack_branch:
############################################################################### ###############################################################################

View File

@ -14,9 +14,10 @@
#overcloud_dib_host_packages_extra: #overcloud_dib_host_packages_extra:
# List of overcloud host disk images to build. Each element is a dict defining # List of overcloud host disk images to build. Each element is a dict defining
# an image in a format accepted by the stackhpc.os-images role. Default is to # an image in a format accepted by the stackhpc.openstack.os_images role.
# build an image named "deployment_image" configured with the overcloud_dib_* # Default is to build an image named "deployment_image" configured with the
# variables defined below: {"name": "deployment_image", "elements": "{{ # overcloud_dib_* variables defined below:
# {"name": "deployment_image", "elements": "{{
# overcloud_dib_elements }}", "env": "{{ overcloud_dib_env_vars }}", # overcloud_dib_elements }}", "env": "{{ overcloud_dib_env_vars }}",
# "packages": "{{ overcloud_dib_packages }}"}. # "packages": "{{ overcloud_dib_packages }}"}.
#overcloud_dib_host_images: #overcloud_dib_host_images:
@ -57,15 +58,15 @@
#overcloud_dib_packages: #overcloud_dib_packages:
# List of default git repositories containing Diskimage Builder (DIB) elements. # List of default git repositories containing Diskimage Builder (DIB) elements.
# See stackhpc.os-images role for usage. Default is empty. # See stackhpc.openstack.os_images role for usage. Default is empty.
#overcloud_dib_git_elements_default: #overcloud_dib_git_elements_default:
# List of additional git repositories containing Diskimage Builder (DIB) # 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.
#overcloud_dib_git_elements_extra: #overcloud_dib_git_elements_extra:
# List of git repositories containing Diskimage Builder (DIB) elements. See # 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
# overcloud_dib_git_elements_default and overcloud_dib_git_elements_extra. # overcloud_dib_git_elements_default and overcloud_dib_git_elements_extra.
#overcloud_dib_git_elements: #overcloud_dib_git_elements:

View File

@ -48,10 +48,8 @@
#seed_lvm_groups_extra: #seed_lvm_groups_extra:
# Whether a 'data' LVM volume group should exist on the seed. By default this # Whether a 'data' LVM volume group should exist on the seed. By default this
# contains a 'docker-volumes' logical volume for Docker volume storage. It will # contains a 'docker-volumes' logical volume for Docker volume storage.
# also be used for Docker container and image storage if # Default is false.
# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
#seed_lvm_group_data_enabled: #seed_lvm_group_data_enabled:
# Seed LVM volume group for data. See mrlesmithjr.manage_lvm role for format. # Seed LVM volume group for data. See mrlesmithjr.manage_lvm role for format.

View File

@ -81,10 +81,8 @@
#storage_lvm_groups_extra: #storage_lvm_groups_extra:
# Whether a 'data' LVM volume group should exist on storage hosts. By default # Whether a 'data' LVM volume group should exist on storage hosts. By default
# this contains a 'docker-volumes' logical volume for Docker volume storage. It # this contains a 'docker-volumes' logical volume for Docker volume storage.
# will also be used for Docker container and image storage if # Default is false.
# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
#storage_lvm_group_data_enabled: #storage_lvm_group_data_enabled:
# Storage LVM volume group for data. See mrlesmithjr.manage_lvm role for # Storage LVM volume group for data. See mrlesmithjr.manage_lvm role for