Skip to content

Commit 9eb6a0c

Browse files
jovialpriteau
authored andcommitted
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
1 parent ebba21c commit 9eb6a0c

File tree

6 files changed

+82
-3
lines changed

6 files changed

+82
-3
lines changed

etc/kayobe/bifrost.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
# DIB base OS element. Default is {{ os_distribution }}.
2222
#kolla_bifrost_dib_os_element:
2323

24-
# DIB image OS release. Default is "focal" when os_distribution is "ubuntu", or
25-
# "8" otherwise.
24+
# DIB image OS release. Default is {{ os_release }}.
2625
#kolla_bifrost_dib_os_release:
2726

2827
# List of default DIB elements. Default is ["disable-selinux",

etc/kayobe/docker-registry.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
# pull through cache. Default is an empty dict.
1515
#docker_registry_env:
1616

17+
# The network mode of the docker registry container. Default is 'host'.
18+
#docker_registry_network_mode:
19+
1720
# The port on which the docker registry server should listen. Default is 4000.
1821
#docker_registry_port:
1922

etc/kayobe/globals.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@
4949
# "centos".
5050
#os_distribution:
5151

52+
# OS release. Valid options are "8-stream" when os_distribution is "centos", or
53+
# "focal" when os_distribution is "ubuntu".
54+
#os_release:
55+
5256
###############################################################################
5357
# Dummy variable to allow Ansible to accept this file.
5458
workaround_ansible_issue_8743: yes

etc/kayobe/inventory/groups

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ storage
4242
compute
4343

4444
###############################################################################
45-
# Docker groups.
45+
# Service groups.
4646

4747
[docker:children]
4848
# Hosts in this group will have Docker installed.
@@ -59,6 +59,12 @@ compute
5959
# registries which may become unsynchronized.
6060
seed
6161

62+
[ntp:children]
63+
# Kayobe will configure Chrony on members of this group.
64+
seed
65+
seed-hypervisor
66+
overcloud
67+
6268
###############################################################################
6369
# Baremetal compute node groups.
6470

etc/kayobe/kolla.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,33 @@
121121
# Full custom seed inventory contents.
122122
#kolla_seed_inventory_custom:
123123

124+
# List of names of default host variables to pass through from kayobe hosts to
125+
# the kolla-ansible seed host, if set. See also
126+
# kolla_seed_inventory_pass_through_host_vars_map.
127+
#kolla_seed_inventory_pass_through_host_vars_default:
128+
129+
# List of names of additional host variables to pass through from kayobe hosts
130+
# to the kolla-ansible seed host, if set. See also
131+
# kolla_seed_inventory_pass_through_host_vars_map.
132+
#kolla_seed_inventory_pass_through_host_vars_extra:
133+
124134
# List of names of host variables to pass through from kayobe hosts to
125135
# the kolla-ansible seed host, if set. See also
126136
# kolla_seed_inventory_pass_through_host_vars_map.
127137
#kolla_seed_inventory_pass_through_host_vars:
128138

139+
# Dict mapping names of default variables in
140+
# kolla_seed_inventory_pass_through_host_vars to the variable to use in
141+
# kolla-ansible. If a variable name is not in this mapping the kayobe name is
142+
# used.
143+
#kolla_seed_inventory_pass_through_host_vars_map_default:
144+
145+
# Dict mapping names of extra variables in
146+
# kolla_seed_inventory_pass_through_host_vars to the variable to use in
147+
# kolla-ansible. If a variable name is not in this mapping the kayobe name is
148+
# used.
149+
#kolla_seed_inventory_pass_through_host_vars_map_extra:
150+
129151
# Dict mapping names of variables in
130152
# kolla_seed_inventory_pass_through_host_vars to the variable to use in
131153
# kolla-ansible. If a variable name is not in this mapping the kayobe name is
@@ -158,11 +180,33 @@
158180
# have no hosts mapped to them will be provided with an empty group definition.
159181
#kolla_overcloud_inventory_kolla_top_level_groups:
160182

183+
# List of names of default host variables to pass through from kayobe hosts to
184+
# kolla-ansible hosts, if set. See also
185+
# kolla_overcloud_inventory_pass_through_host_vars_map.
186+
#kolla_overcloud_inventory_pass_through_host_vars_default:
187+
188+
# List of names of additional host variables to pass through from kayobe hosts
189+
# to kolla-ansible hosts, if set. See also
190+
# kolla_overcloud_inventory_pass_through_host_vars_map.
191+
#kolla_overcloud_inventory_pass_through_host_vars_extra:
192+
161193
# List of names of host variables to pass through from kayobe hosts to
162194
# kolla-ansible hosts, if set. See also
163195
# kolla_overcloud_inventory_pass_through_host_vars_map.
164196
#kolla_overcloud_inventory_pass_through_host_vars:
165197

198+
# Dict mapping names of default variables in
199+
# kolla_overcloud_inventory_pass_through_host_vars to the variable to use in
200+
# kolla-ansible. If a variable name is not in this mapping the kayobe name is
201+
# used.
202+
#kolla_overcloud_inventory_pass_through_host_vars_map_default:
203+
204+
# Dict mapping names of additional variables in
205+
# kolla_overcloud_inventory_pass_through_host_vars to the variable to use in
206+
# kolla-ansible. If a variable name is not in this mapping the kayobe name is
207+
# used.
208+
#kolla_overcloud_inventory_pass_through_host_vars_map_extra:
209+
166210
# Dict mapping names of variables in
167211
# kolla_overcloud_inventory_pass_through_host_vars to the variable to use in
168212
# kolla-ansible. If a variable name is not in this mapping the kayobe name is

etc/kayobe/time.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,29 @@
77
# Name of the local timezone.
88
#timezone:
99

10+
###############################################################################
11+
# Network Time Protocol (NTP).
12+
13+
# List of NTP time sources to configure. Format is a list of dictionaries with
14+
# the following keys:
15+
# server: host or pool
16+
# type: (Optional) Defaults to server. Maps to a time source in the
17+
# configuration file. Can be one of server, peer, pool.
18+
# options: (Optional) List of options that depends on type, see Chrony
19+
# documentation for details.
20+
# See: https://chrony.tuxfamily.org/doc/4.0/chrony.conf.html
21+
#
22+
# Example of configuring a pool and customising the pool specific maxsources
23+
# option:
24+
# chrony_ntp_servers:
25+
# - server: pool.ntp.org
26+
# type: pool
27+
# options:
28+
# - option: maxsources
29+
# val: 3
30+
#
31+
#chrony_ntp_servers:
32+
1033
###############################################################################
1134
# Dummy variable to allow Ansible to accept this file.
1235
workaround_ansible_issue_8743: yes

0 commit comments

Comments
 (0)