Synchronise with kayobe stable/yoga

Synchronise with kayobe @ 32b12be953d0c2f60970a95b82d0ebf846d0f86f.

Change-Id: Ib4b75c084820f16ce245c1e1c50f10ccb2083537
This commit is contained in:
Pierre Riteau 2023-12-08 12:10:48 +01:00
parent ded3c040fa
commit d422259ce1
11 changed files with 63 additions and 39 deletions

View File

@ -116,6 +116,9 @@
# 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:

View File

@ -63,15 +63,15 @@
###############################################################################
# Compute node LVM configuration.
# List of compute volume groups. See mrlesmithjr.manage-lvm role for
# List of compute volume groups. See mrlesmithjr.manage_lvm role for
# format.
#compute_lvm_groups:
# Default list of compute volume groups. See mrlesmithjr.manage-lvm role for
# Default list of compute volume groups. See mrlesmithjr.manage_lvm role for
# format.
#compute_lvm_groups_default:
# Additional list of compute volume groups. See mrlesmithjr.manage-lvm role
# Additional list of compute volume groups. See mrlesmithjr.manage_lvm role
# for format.
#compute_lvm_groups_extra:
@ -82,7 +82,7 @@
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
#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
# format.
#compute_lvm_group_data:

View File

@ -72,15 +72,15 @@
###############################################################################
# Controller node LVM configuration.
# List of controller volume groups. See mrlesmithjr.manage-lvm role for
# List of controller volume groups. See mrlesmithjr.manage_lvm role for
# format.
#controller_lvm_groups:
# Default list of controller volume groups. See mrlesmithjr.manage-lvm role for
# Default list of controller volume groups. See mrlesmithjr.manage_lvm role for
# format.
#controller_lvm_groups_default:
# Additional list of controller volume groups. See mrlesmithjr.manage-lvm role
# Additional list of controller volume groups. See mrlesmithjr.manage_lvm role
# for format.
#controller_lvm_groups_extra:
@ -91,7 +91,7 @@
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
#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
# format.
#controller_lvm_group_data:

View File

@ -4,8 +4,7 @@
###############################################################################
# Local path configuration (Ansible control host).
# Path to Kayobe configuration directory on Ansible control host, with an
# environment path appended if kayobe_environment is set.
# Path to Kayobe configuration directory on Ansible control host.
#kayobe_config_path:
# Name of Kayobe environment to use. Default is $KAYOBE_ENVIRONMENT, or an
@ -50,7 +49,7 @@
#os_distribution:
# OS release. Valid options are "8-stream" when os_distribution is "centos", or
# "8" when os_distribution is "rocky", or "focal" and "jammy" when
# "8" or "9" when os_distribution is "rocky", or "focal" and "jammy" when
# os_distribution is "ubuntu".
#os_release:

View File

@ -32,10 +32,12 @@
# Base image for the infra VM root volume. Default is
# "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
# when os_distribution is "ubuntu", or
# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
# when os_distribution is "rocky",
# https://dl.rockylinux.org/pub/rocky/8/images/x86_64/Rocky-8-GenericCloud.latest.x86_64.qcow2
# when os_distribution is "rocky" and os_release is "8"
# or
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.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" and os_release is "9"
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-latest.x86_64.qcow2"
# otherwise.
#infra_vm_root_image:
@ -92,15 +94,15 @@
###############################################################################
# Infrastructure VM node LVM configuration.
# List of infrastructure vm volume groups. See mrlesmithjr.manage-lvm role for
# List of infrastructure vm volume groups. See mrlesmithjr.manage_lvm role for
# format.
#infra_vm_lvm_groups:
# Default list of infrastructure vm volume groups. See mrlesmithjr.manage-lvm
# Default list of infrastructure vm volume groups. See mrlesmithjr.manage_lvm
# role for format.
#infra_vm_lvm_groups_default:
# Additional list of infrastructure vm volume groups. See mrlesmithjr.manage-lvm
# Additional list of infrastructure vm volume groups. See mrlesmithjr.manage_lvm
# role for format.
#infra_vm_lvm_groups_extra:
@ -111,7 +113,7 @@
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
#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
# for format.
#infra_vm_lvm_group_data:

View File

@ -67,8 +67,9 @@
# Kolla configuration.
# Kolla base container image distribution. Options are "centos", "debian",
# "ubuntu". Default is
# {{ 'centos' if os_distribution == 'rocky' else os_distribution }}.
# "rocky", "ubuntu". Default is
# {{ 'centos' if (os_distribution == 'rocky' and os_release == '8') else
# os_distribution }}.
#kolla_base_distro:
# Kolla container image type: binary or source. Default is 'source'.
@ -298,6 +299,7 @@
#kolla_enable_gnocchi:
#kolla_enable_gnocchi_statsd:
#kolla_enable_grafana:
#kolla_enable_grafana_external:
#kolla_enable_hacluster:
#kolla_enable_haproxy:
#kolla_enable_haproxy_memcached:
@ -337,6 +339,7 @@
#kolla_enable_keystone_federation:
#kolla_enable_keystone_horizon_policy_file:
#kolla_enable_kibana:
#kolla_enable_kibana_external:
#kolla_enable_kuryr:
#kolla_enable_loadbalancer:
#kolla_enable_magnum:
@ -349,6 +352,8 @@
#kolla_enable_mariabackup:
#kolla_enable_mariadb:
#kolla_enable_masakari:
#kolla_enable_masakari_hostmonitor:
#kolla_enable_masakari_instancemonitor:
#kolla_enable_memcached:
#kolla_enable_mistral:
#kolla_enable_monasca:
@ -379,6 +384,9 @@
#kolla_enable_nova_ssh:
#kolla_enable_octavia:
#kolla_enable_octavia_driver_agent:
#kolla_enable_opensearch:
#kolla_enable_opensearch_dashboards:
#kolla_enable_opensearch_dashboards_external:
#kolla_enable_openstack_core:
#kolla_enable_openvswitch:
#kolla_enable_osprofiler:
@ -388,6 +396,7 @@
#kolla_enable_placement:
#kolla_enable_prometheus:
#kolla_enable_prometheus_alertmanager:
#kolla_enable_prometheus_alertmanager_external:
#kolla_enable_prometheus_blackbox_exporter:
#kolla_enable_prometheus_cadvisor:
#kolla_enable_prometheus_ceph_mgr_exporter:
@ -397,6 +406,7 @@
#kolla_enable_prometheus_haproxy_exporter:
#kolla_enable_prometheus_libvirt_exporter:
#kolla_enable_prometheus_memcached_exporter:
#kolla_enable_prometheus_msteams:
#kolla_enable_prometheus_mysqld_exporter:
#kolla_enable_prometheus_node_exporter:
#kolla_enable_prometheus_openstack_exporter:
@ -430,6 +440,10 @@
# Kolla passwords file.
#kolla_ansible_default_custom_passwords:
# Dictionary containing extra custom passwords to add or override in the Kolla
# passwords file.
#kolla_ansible_extra_custom_passwords:
# Dictionary containing custom passwords to add or override in the Kolla
# passwords file.
#kolla_ansible_custom_passwords:
@ -469,7 +483,7 @@
# Path to a CA certificate file to use for the OS_CACERT environment variable
# in public-openrc.sh file when TLS is enabled, instead of Kolla-Ansible's
# default.
#kolla_external_fqdn_cacert:
#kolla_public_openrc_cacert:
# Internal API certificate bundle.
#
@ -482,7 +496,7 @@
# Path to a CA certificate file to use for the OS_CACERT environment variable
# in admin-openrc.sh file when TLS is enabled, instead of Kolla-Ansible's
# default.
#kolla_internal_fqdn_cacert:
#kolla_admin_openrc_cacert:
###############################################################################
# Proxy configuration

View File

@ -63,15 +63,15 @@
###############################################################################
# Monitoring node LVM configuration.
# List of monitoring node volume groups. See mrlesmithjr.manage-lvm role for
# List of monitoring node volume groups. See mrlesmithjr.manage_lvm role for
# format.
#monitoring_lvm_groups:
# Default list of monitoring node volume groups. See mrlesmithjr.manage-lvm
# Default list of monitoring node volume groups. See mrlesmithjr.manage_lvm
# role for format.
#monitoring_lvm_groups_default:
# Additional list of monitoring node volume groups. See mrlesmithjr.manage-lvm
# Additional list of monitoring node volume groups. See mrlesmithjr.manage_lvm
# role for format.
#monitoring_lvm_groups_extra:

View File

@ -36,7 +36,7 @@
###############################################################################
# Seed hypervisor node LVM configuration.
# List of seed hypervisor volume groups. See mrlesmithjr.manage-lvm role for
# List of seed hypervisor volume groups. See mrlesmithjr.manage_lvm role for
# format. Set to "{{ seed_hypervisor_lvm_groups_with_data }}" to create a
# volume group for libvirt storage.
#seed_hypervisor_lvm_groups:
@ -45,7 +45,7 @@
# default.
#seed_hypervisor_lvm_groups_with_data:
# 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.
#seed_hypervisor_lvm_group_data:
# List of disks for use by seed hypervisor LVM data volume group. Default to an

View File

@ -25,11 +25,13 @@
# Base image for the seed VM root volume. Default is
# "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
# when os_distribution is "ubuntu",
# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
# when os_distribution is "rocky",
# when os_distribution is "ubuntu", or
# https://dl.rockylinux.org/pub/rocky/8/images/x86_64/Rocky-8-GenericCloud.latest.x86_64.qcow2
# when os_distribution is "rocky" and os_release is "8"
# or
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.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" and os_release is "9"
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-latest.x86_64.qcow2"
# otherwise.
#seed_vm_root_image:

View File

@ -36,14 +36,14 @@
###############################################################################
# Seed node LVM configuration.
# List of seed volume groups. See mrlesmithjr.manage-lvm role for format.
# List of seed volume groups. See mrlesmithjr.manage_lvm role for format.
#seed_lvm_groups:
# Default list of seed volume groups. See mrlesmithjr.manage-lvm role for
# Default list of seed volume groups. See mrlesmithjr.manage_lvm role for
# format.
#seed_lvm_groups_default:
# Additional list of seed volume groups. See mrlesmithjr.manage-lvm role for
# Additional list of seed volume groups. See mrlesmithjr.manage_lvm role for
# format.
#seed_lvm_groups_extra:
@ -54,7 +54,7 @@
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
#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.
#seed_lvm_group_data:
# List of disks for use by seed LVM data volume group. Default to an invalid
@ -106,6 +106,10 @@
#
#seed_containers:
# Whether to attempt a basic authentication login to a registry when
# deploying seed containers
#seed_deploy_containers_registry_attempt_login:
###############################################################################
# Seed node firewalld configuration.

View File

@ -68,15 +68,15 @@
###############################################################################
# Storage node LVM configuration.
# List of storage volume groups. See mrlesmithjr.manage-lvm role for
# List of storage volume groups. See mrlesmithjr.manage_lvm role for
# format.
#storage_lvm_groups:
# Default list of storage volume groups. See mrlesmithjr.manage-lvm role for
# Default list of storage volume groups. See mrlesmithjr.manage_lvm role for
# format.
#storage_lvm_groups_default:
# Additional list of storage volume groups. See mrlesmithjr.manage-lvm role
# Additional list of storage volume groups. See mrlesmithjr.manage_lvm role
# for format.
#storage_lvm_groups_extra:
@ -87,7 +87,7 @@
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
#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
# format.
#storage_lvm_group_data: