[release] Synchronise with kayobe for 2024.2

Change-Id: I5a8de9292fdb01e1f3a44d812bb050cbb07309dd
This commit is contained in:
Pierre Riteau 2024-11-04 20:08:16 +01:00
parent a6ae5cf5a0
commit 2f8cc0faea
9 changed files with 42 additions and 11 deletions

View File

@ -30,7 +30,7 @@
# * types: whitespace-separated list of repository types, e.g. deb or deb-src # * types: whitespace-separated list of repository types, e.g. deb or deb-src
# (optional, default is 'deb') # (optional, default is 'deb')
# * url: URL of the repository # * url: URL of the repository
# * suites: whitespace-separated list of suites, e.g. jammy (optional, default # * suites: whitespace-separated list of suites, e.g. noble (optional, default
# is ansible_facts.distribution_release) # is ansible_facts.distribution_release)
# * components: whitespace-separated list of components, e.g. main (optional, # * components: whitespace-separated list of components, e.g. main (optional,
# default is 'main') # default is 'main')
@ -41,6 +41,14 @@
# Default is an empty list. # Default is an empty list.
#apt_repositories: #apt_repositories:
# List of Apt preferences options. Each item is a dict with the following
# keys:
# * content: free-form preferences file content
# * filename: name of a file in /etc/apt/preferences.d/ in which to write
# the configuration
# Default is an empty list.
#apt_preferences:
# Whether to disable repositories in /etc/apt/sources.list. This may be used # Whether to disable repositories in /etc/apt/sources.list. This may be used
# when replacing the distribution repositories via apt_repositories. # when replacing the distribution repositories via apt_repositories.
# Default is false. # Default is false.
@ -50,8 +58,6 @@
# * machine: 'machine' entry in the auth file # * machine: 'machine' entry in the auth file
# * login: 'login' entry in the auth file # * login: 'login' entry in the auth file
# * password: 'password' 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 # * filename: Name of a file in /etc/apt/auth.conf.d in which to store
# the auth configuration. The extension should be ``.conf``. # the auth configuration. The extension should be ``.conf``.
# Default is an empty list. # Default is an empty list.

View File

@ -158,6 +158,12 @@
# Server inventory for Bifrost. # Server inventory for Bifrost.
#kolla_bifrost_servers: #kolla_bifrost_servers:
###############################################################################
# Node provisioning configuration
# Whether to use Ironic introspection data for admin interface MAC address
# Default is false.
#kolla_bifrost_use_introspection_mac:
############################################################################### ###############################################################################
# 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

@ -14,6 +14,9 @@
# Password to use to access a host's BMC via IPMI. # Password to use to access a host's BMC via IPMI.
#ipmi_password: #ipmi_password:
# Address to use to access a host's BMC via Redfish.
#redfish_address:
############################################################################### ###############################################################################
# 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

@ -49,7 +49,7 @@
#os_distribution: #os_distribution:
# OS release. Valid options are "9-stream" when os_distribution is "centos", or # OS release. Valid options are "9-stream" when os_distribution is "centos", or
# "9" when os_distribution is "rocky", or "jammy" when os_distribution is # "9" when os_distribution is "rocky", or "noble" when os_distribution is
# "ubuntu". # "ubuntu".
#os_release: #os_release:

View File

@ -30,7 +30,7 @@
#infra_vm_root_format: #infra_vm_root_format:
# Base image for the infra VM root volume. Default is # Base image for the infra VM root volume. Default is
# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img" # "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
# when os_distribution is "ubuntu", or # when os_distribution is "ubuntu", or
# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2 # https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
# when os_distribution is "rocky", # when os_distribution is "rocky",
@ -58,6 +58,12 @@
# OS family. Needed for config drive generation. # OS family. Needed for config drive generation.
#infra_vm_os_family: #infra_vm_os_family:
# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'efi'.
#infra_vm_boot_firmware:
# Machine type. Libvirt default configuration is used.
#infra_vm_machine:
############################################################################### ###############################################################################
# Infrastructure VM node configuration. # Infrastructure VM node configuration.

View File

@ -66,6 +66,10 @@
############################################################################### ###############################################################################
# Kolla configuration. # Kolla configuration.
# Kolla base container image architecture. Options are "x86_64", "aarch64".
# Default is "{{ ansible_facts.architecture }}"
#kolla_base_arch:
# Kolla base container image distribution. Options are "centos", "debian", # Kolla base container image distribution. Options are "centos", "debian",
# "rocky", "ubuntu". Default is {{ os_distribution }}. # "rocky", "ubuntu". Default is {{ os_distribution }}.
#kolla_base_distro: #kolla_base_distro:
@ -286,12 +290,12 @@
#kolla_enable_ceph_rgw: #kolla_enable_ceph_rgw:
#kolla_enable_ceph_rgw_loadbalancer: #kolla_enable_ceph_rgw_loadbalancer:
#kolla_enable_cinder: #kolla_enable_cinder:
#kolla_enable_cinder_backend_hnas_nfs:
#kolla_enable_cinder_backend_iscsi: #kolla_enable_cinder_backend_iscsi:
#kolla_enable_cinder_backend_lvm: #kolla_enable_cinder_backend_lvm:
#kolla_enable_cinder_backend_nfs: #kolla_enable_cinder_backend_nfs:
#kolla_enable_cinder_backend_pure_fc: #kolla_enable_cinder_backend_pure_fc:
#kolla_enable_cinder_backend_pure_iscsi: #kolla_enable_cinder_backend_pure_iscsi:
#kolla_enable_cinder_backend_pure_nvme_tcp:
#kolla_enable_cinder_backend_pure_roce: #kolla_enable_cinder_backend_pure_roce:
#kolla_enable_cinder_backend_quobyte: #kolla_enable_cinder_backend_quobyte:
#kolla_enable_cinder_backup: #kolla_enable_cinder_backup:
@ -412,11 +416,11 @@
#kolla_enable_prometheus_haproxy_exporter: #kolla_enable_prometheus_haproxy_exporter:
#kolla_enable_prometheus_libvirt_exporter: #kolla_enable_prometheus_libvirt_exporter:
#kolla_enable_prometheus_memcached_exporter: #kolla_enable_prometheus_memcached_exporter:
#kolla_enable_prometheus_msteams:
#kolla_enable_prometheus_mysqld_exporter: #kolla_enable_prometheus_mysqld_exporter:
#kolla_enable_prometheus_node_exporter: #kolla_enable_prometheus_node_exporter:
#kolla_enable_prometheus_openstack_exporter: #kolla_enable_prometheus_openstack_exporter:
#kolla_enable_prometheus_openstack_exporter_external: #kolla_enable_prometheus_openstack_exporter_external:
#kolla_enable_prometheus_proxysql_exporter:
#kolla_enable_prometheus_rabbitmq_exporter: #kolla_enable_prometheus_rabbitmq_exporter:
#kolla_enable_prometheus_server: #kolla_enable_prometheus_server:
#kolla_enable_proxysql: #kolla_enable_proxysql:

View File

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

View File

@ -30,7 +30,7 @@
#overcloud_dib_os_release: #overcloud_dib_os_release:
# List of default DIB elements. Default is ["{{ overcloud_dib_os_element }}", # List of default DIB elements. Default is ["{{ overcloud_dib_os_element }}",
# "cloud-init-datasources", "enable-serial-console", "vm"]. # "cloud-init", "cloud-init-datasources", "enable-serial-console", "vm"].
#overcloud_dib_elements_default: #overcloud_dib_elements_default:
# List of additional DIB elements. Default is none. # List of additional DIB elements. Default is none.

View File

@ -30,7 +30,7 @@
#seed_vm_root_format: #seed_vm_root_format:
# Base image for the seed VM root volume. Default is # Base image for the seed VM root volume. Default is
# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img" # "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
# when os_distribution is "ubuntu", # when os_distribution is "ubuntu",
# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2 # https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
# when os_distribution is "rocky", # when os_distribution is "rocky",
@ -61,6 +61,12 @@
# #
#seed_vm_interfaces: #seed_vm_interfaces:
# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'efi'.
#seed_vm_boot_firmware:
# Machine type. Libvirt default configuration is used.
#seed_vm_machine:
############################################################################### ###############################################################################
# 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