Sync kayobe-config-dev with latest kayobe changes

Change-Id: Ib82da83681f153f8ddccb311123abadc42c2eb3b
This commit is contained in:
Pierre Riteau 2021-05-21 18:26:06 +02:00
parent 8d8e9bdba3
commit d9210ff39c
5 changed files with 75 additions and 2 deletions

View File

@ -21,8 +21,7 @@
# DIB base OS element. Default is {{ os_distribution }}. # DIB base OS element. Default is {{ os_distribution }}.
#kolla_bifrost_dib_os_element: #kolla_bifrost_dib_os_element:
# DIB image OS release. Default is "focal" when os_distribution is "ubuntu", or # DIB image OS release. Default is {{ os_release }}.
# "8" otherwise.
#kolla_bifrost_dib_os_release: #kolla_bifrost_dib_os_release:
# List of default DIB elements. Default is ["disable-selinux", # List of default DIB elements. Default is ["disable-selinux",

View File

@ -14,6 +14,9 @@
# pull through cache. Default is an empty dict. # pull through cache. Default is an empty dict.
#docker_registry_env: #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. # The port on which the docker registry server should listen. Default is 4000.
#docker_registry_port: #docker_registry_port:

View File

@ -49,6 +49,10 @@
# "centos". # "centos".
os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}" os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
# 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. # Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes workaround_ansible_issue_8743: yes

View File

@ -121,11 +121,33 @@
# Full custom seed inventory contents. # Full custom seed inventory contents.
#kolla_seed_inventory_custom: #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 # List of names of host variables to pass through from kayobe hosts to
# the kolla-ansible seed host, if set. See also # the kolla-ansible seed host, if set. See also
# kolla_seed_inventory_pass_through_host_vars_map. # kolla_seed_inventory_pass_through_host_vars_map.
#kolla_seed_inventory_pass_through_host_vars: #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 # Dict mapping names of variables in
# kolla_seed_inventory_pass_through_host_vars to the variable to use 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 # 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. # have no hosts mapped to them will be provided with an empty group definition.
#kolla_overcloud_inventory_kolla_top_level_groups: #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 # List of names of host variables to pass through from kayobe hosts to
# kolla-ansible hosts, if set. See also # kolla-ansible hosts, if set. See also
# kolla_overcloud_inventory_pass_through_host_vars_map. # kolla_overcloud_inventory_pass_through_host_vars_map.
#kolla_overcloud_inventory_pass_through_host_vars: #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 # Dict mapping names of variables in
# kolla_overcloud_inventory_pass_through_host_vars to the variable to use 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 # kolla-ansible. If a variable name is not in this mapping the kayobe name is

View File

@ -7,6 +7,29 @@
# Name of the local timezone. # Name of the local timezone.
#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. # Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes workaround_ansible_issue_8743: yes