From 9eb6a0cb2dfeadaf8de68da9cf03ab1955ed6ed8 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Thu, 13 May 2021 16:21:12 +0100 Subject: [PATCH] Synchronize kayobe-config A few late additions to the wallaby release. See: - https://docs.openstack.org/kayobe/latest/contributor/releases.html#synchronise-kayobe-config Change-Id: If74ad440a11d654829ac1d628ab3c0ef7aed18e1 --- etc/kayobe/bifrost.yml | 3 +-- etc/kayobe/docker-registry.yml | 3 +++ etc/kayobe/globals.yml | 4 ++++ etc/kayobe/inventory/groups | 8 ++++++- etc/kayobe/kolla.yml | 44 ++++++++++++++++++++++++++++++++++ etc/kayobe/time.yml | 23 ++++++++++++++++++ 6 files changed, 82 insertions(+), 3 deletions(-) diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml index 8d20ebe..91c8bcc 100644 --- a/etc/kayobe/bifrost.yml +++ b/etc/kayobe/bifrost.yml @@ -21,8 +21,7 @@ # DIB base OS element. Default is {{ os_distribution }}. #kolla_bifrost_dib_os_element: -# DIB image OS release. Default is "focal" when os_distribution is "ubuntu", or -# "8" otherwise. +# DIB image OS release. Default is {{ os_release }}. #kolla_bifrost_dib_os_release: # List of default DIB elements. Default is ["disable-selinux", diff --git a/etc/kayobe/docker-registry.yml b/etc/kayobe/docker-registry.yml index 7ba79ed..ea6ca9c 100644 --- a/etc/kayobe/docker-registry.yml +++ b/etc/kayobe/docker-registry.yml @@ -14,6 +14,9 @@ # pull through cache. Default is an empty dict. #docker_registry_env: +# The network mode of the docker registry container. Default is 'host'. +#docker_registry_network_mode: + # The port on which the docker registry server should listen. Default is 4000. #docker_registry_port: diff --git a/etc/kayobe/globals.yml b/etc/kayobe/globals.yml index 64290d9..9efc114 100644 --- a/etc/kayobe/globals.yml +++ b/etc/kayobe/globals.yml @@ -49,6 +49,10 @@ # "centos". #os_distribution: +# OS release. Valid options are "8-stream" when os_distribution is "centos", or +# "focal" when os_distribution is "ubuntu". +#os_release: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes diff --git a/etc/kayobe/inventory/groups b/etc/kayobe/inventory/groups index a009693..fa1ced4 100644 --- a/etc/kayobe/inventory/groups +++ b/etc/kayobe/inventory/groups @@ -42,7 +42,7 @@ storage compute ############################################################################### -# Docker groups. +# Service groups. [docker:children] # Hosts in this group will have Docker installed. @@ -59,6 +59,12 @@ compute # registries which may become unsynchronized. seed +[ntp:children] +# Kayobe will configure Chrony on members of this group. +seed +seed-hypervisor +overcloud + ############################################################################### # Baremetal compute node groups. diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index a08be42..b43a3b9 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -121,11 +121,33 @@ # Full custom seed inventory contents. #kolla_seed_inventory_custom: +# List of names of default host variables to pass through from kayobe hosts to +# the kolla-ansible seed host, if set. See also +# kolla_seed_inventory_pass_through_host_vars_map. +#kolla_seed_inventory_pass_through_host_vars_default: + +# List of names of additional host variables to pass through from kayobe hosts +# to the kolla-ansible seed host, if set. See also +# kolla_seed_inventory_pass_through_host_vars_map. +#kolla_seed_inventory_pass_through_host_vars_extra: + # List of names of host variables to pass through from kayobe hosts to # the kolla-ansible seed host, if set. See also # kolla_seed_inventory_pass_through_host_vars_map. #kolla_seed_inventory_pass_through_host_vars: +# Dict mapping names of default variables in +# kolla_seed_inventory_pass_through_host_vars to the variable to use in +# kolla-ansible. If a variable name is not in this mapping the kayobe name is +# used. +#kolla_seed_inventory_pass_through_host_vars_map_default: + +# Dict mapping names of extra variables in +# kolla_seed_inventory_pass_through_host_vars to the variable to use in +# kolla-ansible. If a variable name is not in this mapping the kayobe name is +# used. +#kolla_seed_inventory_pass_through_host_vars_map_extra: + # Dict mapping names of variables in # kolla_seed_inventory_pass_through_host_vars to the variable to use in # kolla-ansible. If a variable name is not in this mapping the kayobe name is @@ -158,11 +180,33 @@ # have no hosts mapped to them will be provided with an empty group definition. #kolla_overcloud_inventory_kolla_top_level_groups: +# List of names of default host variables to pass through from kayobe hosts to +# kolla-ansible hosts, if set. See also +# kolla_overcloud_inventory_pass_through_host_vars_map. +#kolla_overcloud_inventory_pass_through_host_vars_default: + +# List of names of additional host variables to pass through from kayobe hosts +# to kolla-ansible hosts, if set. See also +# kolla_overcloud_inventory_pass_through_host_vars_map. +#kolla_overcloud_inventory_pass_through_host_vars_extra: + # List of names of host variables to pass through from kayobe hosts to # kolla-ansible hosts, if set. See also # kolla_overcloud_inventory_pass_through_host_vars_map. #kolla_overcloud_inventory_pass_through_host_vars: +# Dict mapping names of default variables in +# kolla_overcloud_inventory_pass_through_host_vars to the variable to use in +# kolla-ansible. If a variable name is not in this mapping the kayobe name is +# used. +#kolla_overcloud_inventory_pass_through_host_vars_map_default: + +# Dict mapping names of additional variables in +# kolla_overcloud_inventory_pass_through_host_vars to the variable to use in +# kolla-ansible. If a variable name is not in this mapping the kayobe name is +# used. +#kolla_overcloud_inventory_pass_through_host_vars_map_extra: + # Dict mapping names of variables in # kolla_overcloud_inventory_pass_through_host_vars to the variable to use in # kolla-ansible. If a variable name is not in this mapping the kayobe name is diff --git a/etc/kayobe/time.yml b/etc/kayobe/time.yml index c0a86d7..23c1d0d 100644 --- a/etc/kayobe/time.yml +++ b/etc/kayobe/time.yml @@ -7,6 +7,29 @@ # Name of the local timezone. #timezone: +############################################################################### +# Network Time Protocol (NTP). + +# List of NTP time sources to configure. Format is a list of dictionaries with +# the following keys: +# server: host or pool +# type: (Optional) Defaults to server. Maps to a time source in the +# configuration file. Can be one of server, peer, pool. +# options: (Optional) List of options that depends on type, see Chrony +# documentation for details. +# See: https://chrony.tuxfamily.org/doc/4.0/chrony.conf.html +# +# Example of configuring a pool and customising the pool specific maxsources +# option: +# chrony_ntp_servers: +# - server: pool.ntp.org +# type: pool +# options: +# - option: maxsources +# val: 3 +# +#chrony_ntp_servers: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes