[release] Synchronise with kayobe changes for Yoga

Depends-On: https://review.opendev.org/c/openstack/kayobe/+/836040
Change-Id: Ie990e6f0dfa69863d76e58f13037bc3fb74f9230
This commit is contained in:
Mark Goddard 2022-03-31 17:26:21 +01:00
parent 62f6118632
commit 876a4b78c6
11 changed files with 156 additions and 19 deletions

View File

@ -11,6 +11,41 @@
# Apt proxy URL for HTTPS. Default is {{ apt_proxy_http }}. # Apt proxy URL for HTTPS. Default is {{ apt_proxy_http }}.
#apt_proxy_https: #apt_proxy_https:
# List of Apt configuration options. Each item is a dict with the following
# keys:
# * content: free-form configuration file content
# * filename: name of a file in /etc/apt/apt.conf.d/ in which to write the
# configuration
# Default is an empty list.
#apt_config:
# List of apt keys. Each item is a dict containing the following keys:
# * url: URL of key
# * filename: Name of a file in which to store the downloaded key. The
# extension should be '.asc' for ASCII-armoured keys, or '.gpg' otherwise.
# Default is an empty list.
#apt_keys:
# A list of Apt repositories. Each item is a dict with the following keys:
# * types: whitespace-separated list of repository types, e.g. deb or deb-src
# (optional, default is 'deb')
# * url: URL of the repository
# * suites: whitespace-separated list of suites, e.g. focal (optional, default
# is ansible_facts.distribution_release)
# * components: whitespace-separated list of components, e.g. main (optional,
# default is 'main')
# * signed_by: whitespace-separated list of names of GPG keyring files in
# apt_keys_path (optional, default is unset)
# * architecture: whitespace-separated list of architectures that will be used
# (optional, default is unset)
# Default is an empty list.
#apt_repositories:
# Whether to disable repositories in /etc/apt/sources.list. This may be used
# when replacing the distribution repositories via apt_repositories.
# Default is false.
#apt_disable_sources_list:
############################################################################### ###############################################################################
# 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

@ -65,6 +65,12 @@
# Name of disk image file to deploy. Default is "deployment_image.qcow2". # Name of disk image file to deploy. Default is "deployment_image.qcow2".
#kolla_bifrost_deploy_image_filename: #kolla_bifrost_deploy_image_filename:
# 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.
#kolla_bifrost_deploy_image_rootfs:
############################################################################### ###############################################################################
# Ironic configuration. # Ironic configuration.

View File

@ -143,6 +143,53 @@
# - state: enabled # - state: enabled
#compute_firewalld_rules: #compute_firewalld_rules:
###############################################################################
# Compute node host libvirt configuration.
# Whether to enable a host libvirt daemon. Default is true if kolla_enable_nova
# is true and kolla_enable_nova_libvirt_container is false.
#compute_libvirt_enabled:
# A dict of default configuration options to write to
# /etc/libvirt/libvirtd.conf.
#compute_libvirt_conf_default:
# A dict of additional configuration options to write to
# /etc/libvirt/libvirtd.conf.
#compute_libvirt_conf_extra:
# A dict of configuration options to write to /etc/libvirt/libvirtd.conf.
# Default is a combination of compute_libvirt_conf_default and
# compute_libvirt_conf_extra.
#compute_libvirt_conf:
# Numerical log level for libvirtd. Default is 3.
#compute_libvirtd_log_level:
# A dict of default configuration options to write to
# /etc/libvirt/qemu.conf.
#compute_qemu_conf_default:
# A dict of additional configuration options to write to
# /etc/libvirt/qemu.conf.
#compute_qemu_conf_extra:
# A dict of configuration options to write to /etc/libvirt/qemu.conf.
# Default is a combination of compute_qemu_conf_default and
# compute_qemu_conf_extra.
#compute_qemu_conf:
# Whether to enable a libvirt TLS listener. Default is false.
#compute_libvirt_enable_tls:
# Whether to install a Ceph package repository on CentOS and Rocky hosts.
# Default is true.
#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_release:
############################################################################### ###############################################################################
# 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

@ -12,12 +12,18 @@
# Whether or not to use a local Yum mirror. Default value is 'false'. # Whether or not to use a local Yum mirror. Default value is 'false'.
#dnf_use_local_mirror: #dnf_use_local_mirror:
# Mirror FQDN for Yum repos. Default value is 'mirror.centos.org'. # Mirror FQDN for Yum CentOS repos. Default value is 'mirror.centos.org'.
#dnf_centos_mirror_host: #dnf_centos_mirror_host:
# Mirror directory for Yum CentOS repos. Default value is 'centos'. # Mirror directory for Yum CentOS repos. Default value is 'centos'.
#dnf_centos_mirror_directory: #dnf_centos_mirror_directory:
# Mirror FQDN for Yum Rocky repos. Default value is 'dl.rockylinux.org'.
#dnf_rocky_mirror_host:
# Mirror directory for Yum Rocky repos. Default value is 'pub/rocky'.
#dnf_rocky_mirror_directory:
# Mirror FQDN for Yum EPEL repos. Default value is # Mirror FQDN for Yum EPEL repos. Default value is
# 'download.fedoraproject.org'. # 'download.fedoraproject.org'.
#dnf_epel_mirror_host: #dnf_epel_mirror_host:
@ -38,7 +44,7 @@
#dnf_custom_repos: #dnf_custom_repos:
# Whether to install the epel-release package. This affects RedHat-based # Whether to install the epel-release package. This affects RedHat-based
# systems only. Default value is 'true'. # systems only. Default value is 'false'.
#dnf_install_epel: #dnf_install_epel:
############################################################################### ###############################################################################

View File

@ -45,12 +45,13 @@
############################################################################### ###############################################################################
# OS distribution. # OS distribution.
# OS distribution name. Valid options are "centos", "ubuntu". Default is # OS distribution name. Valid options are "centos", "rocky", "ubuntu". Default
# "centos". # is "centos".
#os_distribution: #os_distribution:
# OS release. Valid options are "8-stream" when os_distribution is "centos", or # OS release. Valid options are "8-stream" when os_distribution is "centos", or
# "focal" when os_distribution is "ubuntu". # "8" when os_distribution is "rocky", or "focal" when os_distribution is
# "ubuntu".
#os_release: #os_release:
############################################################################### ###############################################################################

View File

@ -32,6 +32,9 @@
# 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/focal/current/focal-server-cloudimg-amd64.img" # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
# when os_distribution is "ubuntu", or # when os_distribution is "ubuntu", or
# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
# when os_distribution is "rocky",
# or
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2" # "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
# otherwise. # otherwise.
#infra_vm_root_image: #infra_vm_root_image:

View File

@ -50,6 +50,11 @@
# Extra requirements to install inside the kolla-ansible virtualenv. # Extra requirements to install inside the kolla-ansible virtualenv.
#kolla_ansible_venv_extra_requirements: #kolla_ansible_venv_extra_requirements:
# Pip requirement specifier for the ansible package. NOTE: This limits the
# version of ansible used by kolla-ansible to avoid new releases from breaking
# tested code. Changes to this limit should be tested.
#kolla_ansible_venv_ansible:
# Path to Kolla-ansible configuration directory. Default is $KOLLA_CONFIG_PATH # Path to Kolla-ansible configuration directory. Default is $KOLLA_CONFIG_PATH
# or /etc/kolla if $KOLLA_CONFIG_PATH is not set. # or /etc/kolla if $KOLLA_CONFIG_PATH is not set.
#kolla_config_path: #kolla_config_path:
@ -62,7 +67,8 @@
# Kolla configuration. # Kolla configuration.
# Kolla base container image distribution. Options are "centos", "debian", # Kolla base container image distribution. Options are "centos", "debian",
# "ubuntu". Default is {{ os_distribution }}. # "ubuntu". Default is
# {{ 'centos' if os_distribution == 'rocky' else os_distribution }}.
#kolla_base_distro: #kolla_base_distro:
# Kolla container image type: binary or source. Default is 'source'. # Kolla container image type: binary or source. Default is 'source'.
@ -261,6 +267,7 @@
#kolla_enable_ceilometer: #kolla_enable_ceilometer:
#kolla_enable_ceilometer_horizon_policy_file: #kolla_enable_ceilometer_horizon_policy_file:
#kolla_enable_ceilometer_ipmi: #kolla_enable_ceilometer_ipmi:
#kolla_enable_ceilometer_prometheus_pushgateway:
#kolla_enable_cells: #kolla_enable_cells:
#kolla_enable_central_logging: #kolla_enable_central_logging:
#kolla_enable_ceph_rgw: #kolla_enable_ceph_rgw:
@ -368,6 +375,7 @@
#kolla_enable_nova: #kolla_enable_nova:
#kolla_enable_nova_fake: #kolla_enable_nova_fake:
#kolla_enable_nova_horizon_policy_file: #kolla_enable_nova_horizon_policy_file:
#kolla_enable_nova_libvirt_container:
#kolla_enable_nova_serialconsole_proxy: #kolla_enable_nova_serialconsole_proxy:
#kolla_enable_nova_ssh: #kolla_enable_nova_ssh:
#kolla_enable_octavia: #kolla_enable_octavia:
@ -385,8 +393,10 @@
#kolla_enable_prometheus_cadvisor: #kolla_enable_prometheus_cadvisor:
#kolla_enable_prometheus_ceph_mgr_exporter: #kolla_enable_prometheus_ceph_mgr_exporter:
#kolla_enable_prometheus_elasticsearch_exporter: #kolla_enable_prometheus_elasticsearch_exporter:
#kolla_enable_prometheus_etcd_integration:
#kolla_enable_prometheus_fluentd_integration: #kolla_enable_prometheus_fluentd_integration:
#kolla_enable_prometheus_haproxy_exporter: #kolla_enable_prometheus_haproxy_exporter:
#kolla_enable_prometheus_libvirt_exporter:
#kolla_enable_prometheus_memcached_exporter: #kolla_enable_prometheus_memcached_exporter:
#kolla_enable_prometheus_mysqld_exporter: #kolla_enable_prometheus_mysqld_exporter:
#kolla_enable_prometheus_node_exporter: #kolla_enable_prometheus_node_exporter:
@ -408,9 +418,9 @@
#kolla_enable_telegraf: #kolla_enable_telegraf:
#kolla_enable_trove: #kolla_enable_trove:
#kolla_enable_trove_singletenant: #kolla_enable_trove_singletenant:
#kolla_enable_venus:
#kolla_enable_vitrage: #kolla_enable_vitrage:
#kolla_enable_vitrage_prometheus_datasource: #kolla_enable_vitrage_prometheus_datasource:
#kolla_enable_vmtp:
#kolla_enable_watcher: #kolla_enable_watcher:
#kolla_enable_zookeeper: #kolla_enable_zookeeper:
#kolla_enable_zun: #kolla_enable_zun:
@ -456,9 +466,6 @@
# certificate bundle for the external API. # certificate bundle for the external API.
# #
# Note that this should be formatted as a literal style block scalar. # Note that this should be formatted as a literal style block scalar.
#
# NOTE: kolla_tls_cert has been renamed to kolla_external_tls_cert. Support for
# the deprecated name kolla_tls_cert will be removed in a future release.
#kolla_external_tls_cert: #kolla_external_tls_cert:
# Path to a CA certificate file to use for the OS_CACERT environment variable # Path to a CA certificate file to use for the OS_CACERT environment variable

View File

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

View File

@ -7,10 +7,19 @@
# Whether to build host disk images with DIB directly instead of through # Whether to build host disk images with DIB directly instead of through
# Bifrost. Setting it to true disables Bifrost image build and allows images to # Bifrost. Setting it to true disables Bifrost image build and allows images to
# be built with the `kayobe overcloud host image build` command. Default value # be built with the `kayobe overcloud host image build` command. Default value
# is False. This will change in a future release. # is {{ os_distribution == 'rocky' }}. This will change in a future release.
#overcloud_dib_build_host_images: #overcloud_dib_build_host_images:
# DIB base OS element. Default is {{ os_distribution }}. # 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
# build an image named "deployment_image" configured with the overcloud_dib_*
# variables defined below: {"name": "deployment_image", "elements": "{{
# overcloud_dib_elements }}", "env": "{{ overcloud_dib_env_vars }}",
# "packages": "{{ overcloud_dib_packages }}"}.
#overcloud_dib_host_images:
# DIB base OS element. Default is {{ 'rocky-container' if os_distribution ==
# 'rocky' else os_distribution }}.
#overcloud_dib_os_element: #overcloud_dib_os_element:
# DIB image OS release. Default is {{ os_release }}. # DIB image OS release. Default is {{ os_release }}.
@ -18,8 +27,11 @@
# List of default DIB elements. Default is ["centos", "cloud-init-datasources", # List of default DIB elements. Default is ["centos", "cloud-init-datasources",
# "disable-selinux", "enable-serial-console", "vm"] when # "disable-selinux", "enable-serial-console", "vm"] when
# overcloud_dib_os_element is "centos", or ["ubuntu", "cloud-init-datasources", # overcloud_dib_os_element is "centos", or ["rocky-container",
# "enable-serial-console", "vm"] when overcloud_dib_os_element is "ubuntu". # "cloud-init-datasources", "disable-selinux", "enable-serial-console", "vm"]
# when overcloud_dib_os_element is "rocky" or
# ["ubuntu", "cloud-init-datasources", "enable-serial-console", "vm"]
# when overcloud_dib_os_element is "ubuntu".
#overcloud_dib_elements_default: #overcloud_dib_elements_default:
# List of additional DIB elements. Default is none. # List of additional DIB elements. Default is none.
@ -31,8 +43,9 @@
# DIB default environment variables. Default is # DIB default environment variables. Default is
# {"DIB_BOOTLOADER_DEFAULT_CMDLINE": "nofb nomodeset gfxpayload=text # {"DIB_BOOTLOADER_DEFAULT_CMDLINE": "nofb nomodeset gfxpayload=text
# net.ifnames=1", "DIB_CLOUD_INIT_DATASOURCES": "ConfigDrive", "DIB_RELEASE": # net.ifnames=1", "DIB_CLOUD_INIT_DATASOURCES": "ConfigDrive",
# "{{ overcloud_dib_os_release }}"}. # "DIB_CONTAINERFILE_RUNTIME": "docker", "DIB_CONTAINERFILE_NETWORK_DRIVER":
# "host", "DIB_RELEASE": "{{ overcloud_dib_os_release }}"}.
#overcloud_dib_env_vars_default: #overcloud_dib_env_vars_default:
# DIB additional environment variables. Default is none. # DIB additional environment variables. Default is none.
@ -45,6 +58,19 @@
# List of DIB packages to install. Default is to install no extra packages. # List of DIB packages to install. Default is to install no extra packages.
#overcloud_dib_packages: #overcloud_dib_packages:
# List of default git repositories containing Diskimage Builder (DIB) elements.
# See stackhpc.os-images role for usage. Default is empty.
#overcloud_dib_git_elements_default:
# List of additional git repositories containing Diskimage Builder (DIB)
# elements. See stackhpc.os-images role for usage. Default is empty.
#overcloud_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
# overcloud_dib_git_elements_default and overcloud_dib_git_elements_extra.
#overcloud_dib_git_elements:
# Upper constraints file for installing packages in the virtual environment # Upper constraints file for installing packages in the virtual environment
# used for building overcloud host disk images. Default is {{ # used for building overcloud host disk images. Default is {{
# pip_upper_constraints_file }}. # pip_upper_constraints_file }}.

View File

@ -25,7 +25,10 @@
# 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/focal/current/focal-server-cloudimg-amd64.img" # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
# when os_distribution is "ubuntu", or # when os_distribution is "ubuntu",
# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
# when os_distribution is "rocky",
# or
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2" # "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
# otherwise. # otherwise.
#seed_vm_root_image: #seed_vm_root_image:

View File

@ -30,6 +30,9 @@
# #
#chrony_ntp_servers: #chrony_ntp_servers:
# Synchronise hardware clock with system time. Default is true.
#chrony_rtcsync_enabled:
############################################################################### ###############################################################################
# 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