Skip to content

Commit 2361e76

Browse files
committed
Merge remote-tracking branch 'upstream/stable/2026.1' into 2026.1-merge-upstream
2 parents 95ae8de + 7fba45c commit 2361e76

26 files changed

Lines changed: 569 additions & 97 deletions

.gitreview

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
host=review.opendev.org
33
port=29418
44
project=openstack/kayobe-config.git
5-
defaultbranch=stable/2025.1
5+
defaultbranch=stable/2026.1

etc/kayobe/ansible-control.yml

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
---
2+
###############################################################################
3+
# Ansible control host configuration.
4+
5+
# User with which to access the Ansible control host via SSH during bootstrap,
6+
# in order to setup the Kayobe user account. Default is {{ os_distribution }}.
7+
#ansible_control_bootstrap_user:
8+
9+
###############################################################################
10+
# Ansible control host network interface configuration.
11+
12+
# List of networks to which Ansible control host are attached.
13+
#ansible_control_network_interfaces:
14+
15+
# List of default networks to which Ansible control host are attached.
16+
#ansible_control_default_network_interfaces:
17+
18+
# List of extra networks to which Ansible control host are attached.
19+
#ansible_control_extra_network_interfaces:
20+
21+
###############################################################################
22+
# Ansible control host software RAID configuration.
23+
24+
# List of software RAID arrays. See mrlesmithjr.mdadm role for format.
25+
#ansible_control_mdadm_arrays:
26+
27+
###############################################################################
28+
# Ansible control host encryption configuration.
29+
30+
# List of block devices to encrypt. See stackhpc.luks role for format.
31+
#ansible_control_luks_devices:
32+
33+
###############################################################################
34+
# Ansible control host LVM configuration.
35+
36+
# List of Ansible control host volume groups. See mrlesmithjr.manage_lvm role
37+
# for format.
38+
#ansible_control_lvm_groups:
39+
40+
# Default list of Ansible control host volume groups. See
41+
# mrlesmithjr.manage_lvm role for format.
42+
#ansible_control_lvm_groups_default:
43+
44+
# Additional list of Ansible control host volume groups. See
45+
# mrlesmithjr.manage_lvm role for format.
46+
#ansible_control_lvm_groups_extra:
47+
48+
# Whether a 'data' LVM volume group should exist on the Ansible control host.
49+
# By default this contains a 'docker-volumes' logical volume for Docker volume
50+
# storage. Default is false.
51+
#ansible_control_lvm_group_data_enabled:
52+
53+
# Ansible control host LVM volume group for data. See mrlesmithjr.manage_lvm
54+
# role for format.
55+
#ansible_control_lvm_group_data:
56+
57+
# List of disks for use by Ansible control host LVM data volume group. Default
58+
# to an invalid value to require configuration.
59+
#ansible_control_lvm_group_data_disks:
60+
61+
# List of LVM logical volumes for the data volume group.
62+
#ansible_control_lvm_group_data_lvs:
63+
64+
# Docker volumes LVM backing volume.
65+
#ansible_control_lvm_group_data_lv_docker_volumes:
66+
67+
# Size of docker volumes LVM backing volume.
68+
#ansible_control_lvm_group_data_lv_docker_volumes_size:
69+
70+
# Filesystem for docker volumes LVM backing volume. ext4 allows for shrinking.
71+
#ansible_control_lvm_group_data_lv_docker_volumes_fs:
72+
73+
###############################################################################
74+
# Ansible control host sysctl configuration.
75+
76+
# Dict of sysctl parameters to set.
77+
#ansible_control_sysctl_parameters:
78+
79+
###############################################################################
80+
# Ansible control host tuned configuration.
81+
82+
# Builtin tuned profile to use. Format is same as that used by giovtorres.tuned
83+
# role. Default is throughput-performance.
84+
#ansible_control_tuned_active_builtin_profile:
85+
86+
###############################################################################
87+
# Ansible control host user configuration.
88+
89+
# List of users to create. This should be in a format accepted by the
90+
# singleplatform-eng.users role.
91+
#ansible_control_users:
92+
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+
111+
###############################################################################
112+
# Ansible control host firewalld configuration.
113+
114+
# Whether to install and enable firewalld.
115+
#ansible_control_firewalld_enabled:
116+
117+
# A list of zones to create. Each item is a dict containing a 'zone' item.
118+
#ansible_control_firewalld_zones:
119+
120+
# A firewalld zone to set as the default. Default is unset, in which case the
121+
# default zone will not be changed.
122+
#ansible_control_firewalld_default_zone:
123+
124+
# A list of firewall rules to apply. Each item is a dict containing arguments
125+
# to pass to the firewalld module. Arguments are omitted if not provided, with
126+
# the following exceptions:
127+
# - offline: true
128+
# - permanent: true
129+
# - state: enabled
130+
#ansible_control_firewalld_rules:
131+
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+
147+
###############################################################################
148+
# Ansible control host swap configuration.
149+
150+
# List of swap devices. Each item is a dict containing a 'device' item.
151+
#ansible_control_swap:
152+
153+
###############################################################################
154+
# Ansible control host container engine configuration.
155+
156+
# Whether a container engine should be configured. Default is false.
157+
#ansible_control_container_engine_enabled:
158+
159+
###############################################################################
160+
# Dummy variable to allow Ansible to accept this file.
161+
workaround_ansible_issue_8743: yes

etc/kayobe/bifrost.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
###############################################################################
55
# Bifrost installation.
66

7+
# Whether to install Bifrost. Default is true.
8+
#kolla_enable_bifrost:
9+
710
# URL of Bifrost source code repository.
811
#kolla_bifrost_source_url:
912

@@ -87,18 +90,27 @@
8790
# Ironic Inspector configuration.
8891

8992
# List of of inspector processing plugins.
90-
#kolla_bifrost_inspector_processing_hooks:
93+
#kolla_bifrost_inspector_hooks:
9194

9295
# Which MAC addresses to add as ports during introspection. One of 'all',
9396
# 'active' or 'pxe'.
9497
#kolla_bifrost_inspector_port_addition:
9598

99+
# Which ports to keep after introspection. One of 'all', 'present', or 'added'.
100+
# Default follows Bifrost's default of 'present'.
101+
#kolla_bifrost_inspector_keep_ports:
102+
96103
# List of extra kernel parameters for the inspector default PXE configuration.
97104
# Default is {{ inspector_extra_kernel_options }}, defined in inspector.yml.
98105
# When customising this variable, the default extra kernel parameters should be
99106
# kept to retain full node inspection capabilities.
100107
#kolla_bifrost_inspector_extra_kernel_options:
101108

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+
102114
# List of introspection rules for Bifrost's Ironic Inspector service.
103115
#kolla_bifrost_inspector_rules:
104116

@@ -124,9 +136,6 @@
124136
# Ironic inspector deployment ramdisk location.
125137
#kolla_bifrost_inspector_deploy_ramdisk:
126138

127-
# Ironic inspector legacy deployment kernel location.
128-
#kolla_bifrost_inspector_legacy_deploy_kernel:
129-
130139
# Timeout of hardware inspection on overcloud nodes, in seconds. Default is
131140
# {{ inspector_inspection_timeout }}.
132141
#kolla_bifrost_inspection_timeout:

etc/kayobe/compute.yml

Lines changed: 17 additions & 3 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

@@ -215,9 +230,8 @@
215230
###############################################################################
216231
# Compute node swap configuration.
217232

218-
# List of swap devices. Each item is a dict containing a 'device' item. Default
219-
# is an empty list.
220-
# compute_swap:
233+
# List of swap devices. Each item is a dict containing a 'device' item.
234+
#compute_swap:
221235

222236
###############################################################################
223237
# Dummy variable to allow Ansible to accept this file.

etc/kayobe/controllers.yml

Lines changed: 51 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@
106106

107107
# Whether a 'data' LVM volume group should exist on controller hosts. By
108108
# default this contains a 'docker-volumes' logical volume for Docker volume
109-
# storage.
110-
# Default is false.
109+
# storage. Default is false.
111110
#controller_lvm_group_data_enabled:
112111

113112
# Controller LVM volume group for data. See mrlesmithjr.manage_lvm role for
@@ -118,18 +117,33 @@
118117
# invalid value to require configuration.
119118
#controller_lvm_group_data_disks:
120119

120+
# List of LVM logical volumes for the data volume group when using docker.
121+
#controller_lvm_group_data_docker_lvs:
122+
123+
# List of LVM logical volumes for the data volume group when using podman.
124+
#controller_lvm_group_data_podman_lvs:
125+
121126
# List of LVM logical volumes for the data volume group.
122127
#controller_lvm_group_data_lvs:
123128

124129
# Docker volumes LVM backing volume.
125130
#controller_lvm_group_data_lv_docker_volumes:
126131

132+
# Podman volumes LVM backing volume.
133+
#controller_lvm_group_data_lv_podman_volumes:
134+
127135
# Size of docker volumes LVM backing volume.
128136
#controller_lvm_group_data_lv_docker_volumes_size:
129137

130138
# Filesystem for docker volumes LVM backing volume. ext4 allows for shrinking.
131139
#controller_lvm_group_data_lv_docker_volumes_fs:
132140

141+
# Size of podman volumes LVM backing volume.
142+
#controller_lvm_group_data_lv_podman_volumes_size:
143+
144+
# Filesystem for podman volumes LVM backing volume. ext4 allows for shrinking.
145+
#controller_lvm_group_data_lv_podman_volumes_fs:
146+
133147
###############################################################################
134148
# Controller node sysctl configuration.
135149

@@ -150,6 +164,24 @@
150164
# singleplatform-eng.users role.
151165
#controller_users:
152166

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+
153185
###############################################################################
154186
# Controller node firewalld configuration.
155187

@@ -171,12 +203,26 @@
171203
# - state: enabled
172204
#controller_firewalld_rules:
173205

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+
174221
###############################################################################
175222
# Controller node swap configuration.
176223

177-
# List of swap devices. Each item is a dict containing a 'device' item. Default
178-
# is an empty list.
179-
# controller_swap:
224+
# List of swap devices. Each item is a dict containing a 'device' item.
225+
#controller_swap:
180226

181227
###############################################################################
182228
# Dummy variable to allow Ansible to accept this file.

etc/kayobe/dnf.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,13 @@ dnf_install_doca: "{{ 'mlnx' in group_names }}"
297297
# Whether to enable the Rocky Linux security repository.
298298
dnf_enable_rocky_security: false
299299

300+
# Override the state of repositories. Expected to be used with repositories not
301+
# managed by dnf_custom_repos. For example:
302+
# dnf_repo_state_overrides:
303+
# crb: enabled
304+
# Default value is {}.
305+
#dnf_repo_state_overrides:
306+
300307
###############################################################################
301308
# DNF Automatic configuration.
302309

0 commit comments

Comments
 (0)