Skip to content

Commit 788ed4f

Browse files
committed
[2026.1] Synchronise config with kayobe
This is the result of following this step in the release doc: https://docs.openstack.org/kayobe/latest/contributor/releases.html#synchronise-kayobe-config Synchronised with kayobe @ 5def63f7d0c354ffb2f9ab01fbab03cfc19a8490. Change-Id: Ia942d944def7c99f7af15686ee459479e0ba680d Signed-off-by: Will Szumski <will@stackhpc.com>
1 parent 85fe414 commit 788ed4f

19 files changed

Lines changed: 307 additions & 18 deletions

etc/kayobe/ansible-control.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,24 @@
9090
# singleplatform-eng.users role.
9191
#ansible_control_users:
9292

93+
###############################################################################
94+
# Ansible control host additional containers configuration
95+
96+
# Dict of containers to deploy.
97+
# Example:
98+
# seed_containers:
99+
# squid:
100+
# image: "docker.io/stackhpc/squid"
101+
# pre: "{{ kayobe_env_config_path }}/containers/squid/pre.yml"
102+
# post: "{{ kayobe_env_config_path }}/containers/squid/post.yml"
103+
# tag: "3.5.20-1"
104+
#
105+
#ansible_control_containers:
106+
107+
# Whether to attempt a basic authentication login to a registry when
108+
# deploying containers.
109+
#ansible_control_manage_containers_registry_attempt_login:
110+
93111
###############################################################################
94112
# Ansible control host firewalld configuration.
95113

@@ -111,6 +129,21 @@
111129
# - state: enabled
112130
#ansible_control_firewalld_rules:
113131

132+
###############################################################################
133+
# Ansible control host fail2ban configuration.
134+
135+
# Whether to install and enable fail2ban.
136+
#ansible_control_fail2ban_enabled:
137+
138+
# List of fail2ban jails for the Ansible control host.
139+
#ansible_control_fail2ban_jail_configuration:
140+
141+
# List of default fail2ban jails for the Ansible control host.
142+
#ansible_control_fail2ban_jail_configuration_default:
143+
144+
# List of extra fail2ban jails for the Ansible control host.
145+
#ansible_control_fail2ban_jail_configuration_extra:
146+
114147
###############################################################################
115148
# Ansible control host swap configuration.
116149

etc/kayobe/bifrost.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,11 @@
106106
# kept to retain full node inspection capabilities.
107107
#kolla_bifrost_inspector_extra_kernel_options:
108108

109+
# Node driver to use for auto-discovered nodes. Default is
110+
# {{ inspector_discovery_enroll_node_driver }}, defined in inspector.yml. Set
111+
# to 'redfish' for modern BMC implementations.
112+
#kolla_bifrost_inspector_default_node_driver:
113+
109114
# List of introspection rules for Bifrost's Ironic Inspector service.
110115
#kolla_bifrost_inspector_rules:
111116

etc/kayobe/compute.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,21 @@
159159
# - state: enabled
160160
#compute_firewalld_rules:
161161

162+
###############################################################################
163+
# Compute node fail2ban configuration.
164+
165+
# Whether to install and enable fail2ban.
166+
#compute_fail2ban_enabled:
167+
168+
# List of fail2ban jails for the compute node.
169+
#compute_fail2ban_jail_configuration:
170+
171+
# List of default fail2ban jails for the compute node.
172+
#compute_fail2ban_jail_configuration_default:
173+
174+
# List of extra fail2ban jails for the compute node.
175+
#compute_fail2ban_jail_configuration_extra:
176+
162177
###############################################################################
163178
# Compute node host libvirt configuration.
164179

etc/kayobe/controllers.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,24 @@
164164
# singleplatform-eng.users role.
165165
#controller_users:
166166

167+
###############################################################################
168+
# Controller node additional containers configuration
169+
170+
# Dict of containers to deploy.
171+
# Example:
172+
# controller_containers:
173+
# squid:
174+
# image: "stackhpc/squid:3.5.20-1"
175+
# pre: "{{ kayobe_env_config_path }}/containers/squid/pre.yml"
176+
# post: "{{ kayobe_env_config_path }}/containers/squid/post.yml"
177+
#
178+
#controller_containers:
179+
180+
181+
# Whether to attempt a basic authentication login to a registry when
182+
# deploying controller containers
183+
#controller_manage_containers_registry_attempt_login:
184+
167185
###############################################################################
168186
# Controller node firewalld configuration.
169187

@@ -185,6 +203,21 @@
185203
# - state: enabled
186204
#controller_firewalld_rules:
187205

206+
###############################################################################
207+
# Controller node fail2ban configuration.
208+
209+
# Whether to install and enable fail2ban.
210+
#controller_fail2ban_enabled:
211+
212+
# List of fail2ban jails for the controller node.
213+
#controller_fail2ban_jail_configuration:
214+
215+
# List of default fail2ban jails for the controller node.
216+
#controller_fail2ban_jail_configuration_default:
217+
218+
# List of extra fail2ban jails for the controller node.
219+
#controller_fail2ban_jail_configuration_extra:
220+
188221
###############################################################################
189222
# Controller node swap configuration.
190223

etc/kayobe/dnf.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@
4747
# systems only. Default value is 'false'.
4848
#dnf_install_epel:
4949

50+
# Override the state of repositories. Expected to be used with repositories not
51+
# managed by dnf_custom_repos. For example:
52+
# dnf_repo_state_overrides:
53+
# crb: enabled
54+
# Default value is {}.
55+
#dnf_repo_state_overrides:
56+
5057
###############################################################################
5158
# DNF Automatic configuration.
5259

etc/kayobe/globals.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@
4848
# is "rocky".
4949
#os_distribution:
5050

51+
# Mapping from OS distribution name to OS family. Supported keys are
52+
# "centos", "rocky", and "ubuntu".
53+
#os_family_map:
54+
55+
# OS family. Valid options are "RedHat" and "Debian". Default depends on
56+
# os_distribution.
57+
#os_family:
58+
5159
# OS release. Valid options are "10-stream" when os_distribution is "centos",
5260
# "10" when os_distribution is "rocky", or "noble" when os_distribution is
5361
# "ubuntu".
@@ -56,6 +64,10 @@
5664
###############################################################################
5765
# Ansible configuration.
5866

67+
# String used as the header comment in files managed by Kayobe. Default is
68+
# "Ansible managed".
69+
#kayobe_managed:
70+
5971
# Filter to apply to the setup module when gathering facts. Default is to not
6072
# specify a filter.
6173
#kayobe_ansible_setup_filter:
@@ -73,6 +85,13 @@
7385
# user would not normally have permission to create. Default is true.
7486
#kayobe_control_host_become:
7587

88+
###############################################################################
89+
# Networking configuration.
90+
91+
# Network configuration engine. Valid options are "default" and "nmstate".
92+
# Default is "default".
93+
#network_engine: default
94+
7695
###############################################################################
7796
# Dummy variable to allow Ansible to accept this file.
7897
workaround_ansible_issue_8743: yes

etc/kayobe/infra-vms.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,23 @@
167167
# singleplatform-eng.users role.
168168
#infra_vm_users:
169169

170+
###############################################################################
171+
# Infrastructure VM node additional containers configuration
172+
173+
# Dict of containers to deploy.
174+
# Example:
175+
# infra_vm_containers:
176+
# squid:
177+
# image: "stackhpc/squid:3.5.20-1"
178+
# pre: "{{ kayobe_env_config_path }}/containers/squid/pre.yml"
179+
# post: "{{ kayobe_env_config_path }}/containers/squid/post.yml"
180+
#
181+
#infra_vm_containers:
182+
183+
# Whether to attempt a basic authentication login to a registry when
184+
# deploying controller containers
185+
#infra_vm_manage_containers_registry_attempt_login:
186+
170187
###############################################################################
171188
# Infrastructure VM node firewalld configuration.
172189

@@ -188,6 +205,21 @@
188205
# - state: enabled
189206
#infra_vm_firewalld_rules:
190207

208+
###############################################################################
209+
# Infrastructure VM node fail2ban configuration.
210+
211+
# Whether to install and enable fail2ban.
212+
#infra_vm_fail2ban_enabled:
213+
214+
# List of fail2ban jails for the infrastructure VM node.
215+
#infra_vm_fail2ban_jail_configuration:
216+
217+
# List of default fail2ban jails for the infrastructure VM node.
218+
#infra_vm_fail2ban_jail_configuration_default:
219+
220+
# List of extra fail2ban jails for the infrastructure VM node.
221+
#infra_vm_fail2ban_jail_configuration_extra:
222+
191223
###############################################################################
192224
# Infrastructure VM node swap configuration.
193225

etc/kayobe/inspector.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
###############################################################################
6767
# Ironic inspector introspection rules configuration.
6868

69-
# Ironic inspector option to enable IPMI rules. Set to 'True' by default.
69+
# Ironic inspector option to enable IPMI rules. Default is true.
7070
#inspector_rules_ipmi_enabled:
7171

7272
# Ironic inspector IPMI username to set.
@@ -86,7 +86,7 @@
8686
# Ironic inspector uses IPMI by default enroll the baremetal nodes, however it
8787
# is possible to use Redfish instead. To do that enable Redfish and make sure
8888
# all of the necessary variables below have been properly set.
89-
# Enable inspector Redfish rules. Set to 'False' by default.
89+
# Enable inspector Redfish rules. Default is false.
9090
#inspector_rules_redfish_enabled:
9191

9292
# Ironic inspector Redfish username to set.
@@ -95,9 +95,12 @@
9595
# Ironic inspector Redfish password to set.
9696
#inspector_redfish_password:
9797

98-
# Redfish CA setting. Set to 'True' by default
98+
# Redfish CA setting. Default is true.
9999
#inspector_rule_var_redfish_verify_ca:
100100

101+
# Log Ironic inspector rules marked sensitive. Default is true.
102+
#ironic_inspector_sensitive_rule_no_log:
103+
101104
# Ironic inspector rule to set IPMI credentials.
102105
#inspector_rule_ipmi_credentials:
103106

etc/kayobe/inventory/groups

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ monitoring
8080
storage
8181
compute
8282
ansible-control
83+
infra-vms
8384

8485
[docker-registry:children]
8586
# Hosts in this group will have a Docker Registry deployed. This group should

etc/kayobe/ipa.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77
# Whether to build IPA images from source.
88
#ipa_build_images:
99

10+
# Override the OS distribution used to build IPA images. Default is the host
11+
# distribution.
12+
#ipa_build_distro:
13+
14+
# Override the OS release used to build IPA images. Default is the host
15+
# release.
16+
#ipa_build_release:
17+
1018
# URL of IPA source repository.
1119
#ipa_build_source_url:
1220

@@ -23,10 +31,11 @@
2331
#ipa_build_dib_host_packages_extra:
2432

2533
# List of default Diskimage Builder (DIB) elements to use when building IPA
26-
# images. Default is ["centos", "dynamic-login", "enable-serial-console",
27-
# "ironic-python-agent-ramdisk"] when os_distribution is "rocky", and
28-
# ["ubuntu", "dynamic-login", "enable-serial-console",
29-
# "ironic-python-agent-ramdisk"] otherwise.
34+
# images. Default is ["rocky-container", "dynamic-login",
35+
# "enable-serial-console", "ironic-python-agent-ramdisk", "baremetal"] when
36+
# ipa_build_distro is "rocky", and [ipa_build_distro, "dynamic-login",
37+
# "enable-serial-console", "ironic-python-agent-ramdisk", "baremetal"]
38+
# otherwise.
3039
#ipa_build_dib_elements_default:
3140

3241
# List of additional Diskimage Builder (DIB) elements to use when building IPA
@@ -64,7 +73,8 @@
6473
# ipa_build_dib_git_elements_default and ipa_build_dib_git_elements_extra.
6574
#ipa_build_dib_git_elements:
6675

67-
# List of DIB packages to install. Default is empty list.
76+
# List of DIB packages to install. Default is ["python3-yaml"] when
77+
# when ipa_build_distro is "rocky", otherwise [].
6878
#ipa_build_dib_packages:
6979

7080
# Upper constraints file for installing packages in the virtual environment

0 commit comments

Comments
 (0)