Skip to content

Commit 23253cf

Browse files
committed
[release] Synchronise with kayobe for 2024.1
Change-Id: I58d25ddc14d742d9ed79db4d5cd2d20a3e2b791a
1 parent 04a6f86 commit 23253cf

File tree

13 files changed

+63
-46
lines changed

13 files changed

+63
-46
lines changed

etc/kayobe/apt.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,17 @@
4646
# Default is false.
4747
#apt_disable_sources_list:
4848

49+
# List of Apt auth configurations. Each item is a dict with the following keys:
50+
# * machine: 'machine' entry in the auth file
51+
# * login: 'login' entry in the auth file
52+
# * password: 'password' entry in the auth file
53+
# * filename: Name of a file in which to store the auth configuration. The
54+
# extension should be '.conf'.
55+
# * filename: Name of a file in /etc/apt/auth.conf.d in which to store
56+
# the auth configuration. The extension should be ``.conf``.
57+
# Default is an empty list.
58+
#apt_auth:
59+
4960
###############################################################################
5061
# Dummy variable to allow Ansible to accept this file.
5162
workaround_ansible_issue_8743: yes

etc/kayobe/bifrost.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,12 @@
108108
# Ironic inspector IPMI password to set.
109109
#kolla_bifrost_inspector_ipmi_password:
110110

111+
# Ironic inspector Redfish username to set.
112+
#kolla_bifrost_inspector_redfish_username:
113+
114+
# Ironic inspector Redfish password to set.
115+
#kolla_bifrost_inspector_redfish_password:
116+
111117
# Ironic inspector network interface name on which to check for an LLDP switch
112118
# port description to use as the node's name.
113119
#kolla_bifrost_inspector_lldp_switch_port_interface:

etc/kayobe/compute.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,8 @@
7676
#compute_lvm_groups_extra:
7777

7878
# Whether a 'data' LVM volume group should exist on compute hosts. By default
79-
# this contains a 'docker-volumes' logical volume for Docker volume storage. It
80-
# will also be used for Docker container and image storage if
81-
# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
82-
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
79+
# this contains a 'docker-volumes' logical volume for Docker volume storage.
80+
# Default is false.
8381
#compute_lvm_group_data_enabled:
8482

8583
# Compute LVM volume group for data. See mrlesmithjr.manage_lvm role for
@@ -180,7 +178,7 @@
180178
#compute_qemu_conf:
181179

182180
# Whether to enable libvirt SASL authentication. Default is true.
183-
#compute_libvirt_enable_sasl: true
181+
#compute_libvirt_enable_sasl:
184182

185183
# libvirt SASL password. Default is unset.
186184
#compute_libvirt_sasl_password:

etc/kayobe/controllers.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,8 @@
105105

106106
# Whether a 'data' LVM volume group should exist on controller hosts. By
107107
# default this contains a 'docker-volumes' logical volume for Docker volume
108-
# storage. It will also be used for Docker container and image storage if
109-
# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
110-
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
108+
# storage.
109+
# Default is false.
111110
#controller_lvm_group_data_enabled:
112111

113112
# Controller LVM volume group for data. See mrlesmithjr.manage_lvm role for

etc/kayobe/infra-vms.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@
106106

107107
# Whether a 'data' LVM volume group should exist on the infrastructure vm. By
108108
# default this contains a 'docker-volumes' logical volume for Docker volume
109-
# storage. It will also be used for Docker container and image storage if
110-
# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
111-
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
109+
# storage. Default is false.
112110
#infra_vm_lvm_group_data_enabled:
113111

114112
# Infrastructure VM LVM volume group for data. See mrlesmithjr.manage_lvm role

etc/kayobe/inspector.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
###############################################################################
5959
# Ironic inspector configuration.
6060

61+
# Ironic inspector option to enable IPMI rules. Set to 'True' by default.
62+
#inspector_rules_ipmi_enabled:
63+
6164
# Ironic inspector IPMI username to set.
6265
#inspector_ipmi_username:
6366

@@ -72,6 +75,21 @@
7275
# check for an LLDP switch port description to use as the node's name.
7376
#inspector_lldp_switch_port_interface_map:
7477

78+
# Ironic inspector uses IPMI by default enroll the baremetal nodes, however it
79+
# is possible to use Redfish instead. To do that enable Redfish and make sure
80+
# all of the necessary variables below have been properly set.
81+
# Enable inspector Redfish rules. Set to 'False' by default.
82+
#inspector_rules_redfish_enabled:
83+
84+
# Ironic inspector Redfish username to set.
85+
#inspector_redfish_username:
86+
87+
# Ironic inspector Redfish password to set.
88+
#inspector_redfish_password:
89+
90+
# Redfish CA setting. Set to 'True' by default
91+
#inspector_rule_var_redfish_verify_ca:
92+
7593
###############################################################################
7694
# Ironic inspector introspection rules configuration.
7795

etc/kayobe/ipa.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,16 @@
5050
#ipa_build_dib_env:
5151

5252
# List of default git repositories containing Diskimage Builder (DIB) elements.
53-
# See stackhpc.os-images role for usage. Default is one item for IPA builder.
53+
# See stackhpc.openstack.os_images role for usage.
54+
# Default is one item for IPA builder.
5455
#ipa_build_dib_git_elements_default:
5556

5657
# List of additional git repositories containing Diskimage Builder (DIB)
57-
# elements. See stackhpc.os-images role for usage. Default is empty.
58+
# elements. See stackhpc.openstack.os_images role for usage. Default is empty.
5859
#ipa_build_dib_git_elements_extra:
5960

6061
# List of git repositories containing Diskimage Builder (DIB) elements. See
61-
# stackhpc.os-images role for usage. Default is a combination of
62+
# stackhpc.openstack.os_images role for usage. Default is a combination of
6263
# ipa_build_dib_git_elements_default and ipa_build_dib_git_elements_extra.
6364
#ipa_build_dib_git_elements:
6465

etc/kayobe/kolla.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@
306306
#kolla_enable_external_api_firewalld:
307307
#kolla_enable_external_mariadb_load_balancer:
308308
#kolla_enable_fluentd:
309-
#kolla_enable_freezer:
309+
#kolla_enable_fluentd_systemd:
310310
#kolla_enable_glance:
311311
#kolla_enable_glance_horizon_policy_file:
312312
#kolla_enable_glance_image_cache:
@@ -323,29 +323,23 @@
323323
#kolla_enable_horizon_blazar:
324324
#kolla_enable_horizon_cloudkitty:
325325
#kolla_enable_horizon_designate:
326-
#kolla_enable_horizon_freezer:
326+
#kolla_enable_horizon_fwaas:
327327
#kolla_enable_horizon_heat:
328328
#kolla_enable_horizon_ironic:
329329
#kolla_enable_horizon_magnum:
330330
#kolla_enable_horizon_manila:
331331
#kolla_enable_horizon_masakari:
332332
#kolla_enable_horizon_mistral:
333-
#kolla_enable_horizon_murano:
334333
#kolla_enable_horizon_neutron_vpnaas:
335334
#kolla_enable_horizon_octavia:
336-
#kolla_enable_horizon_sahara:
337-
#kolla_enable_horizon_senlin:
338-
#kolla_enable_horizon_solum:
339335
#kolla_enable_horizon_tacker:
340336
#kolla_enable_horizon_trove:
341-
#kolla_enable_horizon_vitrage:
342337
#kolla_enable_horizon_watcher:
343338
#kolla_enable_horizon_zun:
344339
#kolla_enable_influxdb:
345340
#kolla_enable_ironic:
346341
#kolla_enable_ironic_neutron_agent:
347342
#kolla_enable_ironic_prometheus_exporter:
348-
#kolla_enable_ironic_pxe_uefi:
349343
#kolla_enable_iscsid:
350344
#kolla_enable_keepalived:
351345
#kolla_enable_keystone:
@@ -369,11 +363,11 @@
369363
#kolla_enable_memcached:
370364
#kolla_enable_mistral:
371365
#kolla_enable_multipathd:
372-
#kolla_enable_murano:
373366
#kolla_enable_neutron:
374367
#kolla_enable_neutron_agent_ha:
375368
#kolla_enable_neutron_bgp_dragent:
376369
#kolla_enable_neutron_dvr:
370+
#kolla_enable_neutron_fwaas:
377371
#kolla_enable_neutron_horizon_policy_file:
378372
#kolla_enable_neutron_infoblox_ipam_agent:
379373
#kolla_enable_neutron_metering:
@@ -385,6 +379,7 @@
385379
#kolla_enable_neutron_segments:
386380
#kolla_enable_neutron_sfc:
387381
#kolla_enable_neutron_sriov:
382+
#kolla_enable_neutron_taas:
388383
#kolla_enable_neutron_trunk:
389384
#kolla_enable_neutron_vpnaas:
390385
#kolla_enable_nova:
@@ -402,7 +397,6 @@
402397
#kolla_enable_openstack_core:
403398
#kolla_enable_openvswitch:
404399
#kolla_enable_osprofiler:
405-
#kolla_enable_outward_rabbitmq:
406400
#kolla_enable_ovn:
407401
#kolla_enable_ovs_dpdk:
408402
#kolla_enable_placement:
@@ -428,10 +422,7 @@
428422
#kolla_enable_proxysql:
429423
#kolla_enable_rabbitmq:
430424
#kolla_enable_redis:
431-
#kolla_enable_sahara:
432-
#kolla_enable_senlin:
433425
#kolla_enable_skyline:
434-
#kolla_enable_solum:
435426
#kolla_enable_swift:
436427
#kolla_enable_swift_recon:
437428
#kolla_enable_swift_s3api:
@@ -440,8 +431,6 @@
440431
#kolla_enable_trove:
441432
#kolla_enable_trove_singletenant:
442433
#kolla_enable_venus:
443-
#kolla_enable_vitrage:
444-
#kolla_enable_vitrage_prometheus_datasource:
445434
#kolla_enable_watcher:
446435
#kolla_enable_zun:
447436

etc/kayobe/networks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
#
7070
# example_cidr: 10.0.0.0/24
7171
# example_allocation_pool_start: 10.0.0.2
72-
# example_allocation_pool_start: 10.0.0.254
72+
# example_allocation_pool_end: 10.0.0.254
7373
# example_gateway: 10.0.0.1
7474
# example_vlan: 42
7575
#

etc/kayobe/openstack.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
###############################################################################
33
# OpenStack release configuration.
44

5-
# Name of the current OpenStack release. Default is "2023.2".
5+
# Name of the current OpenStack release. Default is "2024.1".
66
#openstack_release:
77

8-
# Name of the current OpenStack branch. Default is "stable/2023.2".
8+
# Name of the current OpenStack branch. Default is "stable/2024.1".
99
#openstack_branch:
1010

1111
###############################################################################

etc/kayobe/overcloud-dib.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
#overcloud_dib_host_packages_extra:
1515

1616
# List of overcloud host disk images to build. Each element is a dict defining
17-
# an image in a format accepted by the stackhpc.os-images role. Default is to
18-
# build an image named "deployment_image" configured with the overcloud_dib_*
19-
# variables defined below: {"name": "deployment_image", "elements": "{{
17+
# an image in a format accepted by the stackhpc.openstack.os_images role.
18+
# Default is to build an image named "deployment_image" configured with the
19+
# overcloud_dib_* variables defined below:
20+
# {"name": "deployment_image", "elements": "{{
2021
# overcloud_dib_elements }}", "env": "{{ overcloud_dib_env_vars }}",
2122
# "packages": "{{ overcloud_dib_packages }}"}.
2223
#overcloud_dib_host_images:
@@ -57,15 +58,15 @@
5758
#overcloud_dib_packages:
5859

5960
# List of default git repositories containing Diskimage Builder (DIB) elements.
60-
# See stackhpc.os-images role for usage. Default is empty.
61+
# See stackhpc.openstack.os_images role for usage. Default is empty.
6162
#overcloud_dib_git_elements_default:
6263

6364
# List of additional git repositories containing Diskimage Builder (DIB)
64-
# elements. See stackhpc.os-images role for usage. Default is empty.
65+
# elements. See stackhpc.openstack.os_images role for usage. Default is empty.
6566
#overcloud_dib_git_elements_extra:
6667

6768
# List of git repositories containing Diskimage Builder (DIB) elements. See
68-
# stackhpc.os-images role for usage. Default is a combination of
69+
# stackhpc.openstack.os_images role for usage. Default is a combination of
6970
# overcloud_dib_git_elements_default and overcloud_dib_git_elements_extra.
7071
#overcloud_dib_git_elements:
7172

etc/kayobe/seed.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,8 @@
4848
#seed_lvm_groups_extra:
4949

5050
# Whether a 'data' LVM volume group should exist on the seed. By default this
51-
# contains a 'docker-volumes' logical volume for Docker volume storage. It will
52-
# also be used for Docker container and image storage if
53-
# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
54-
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
51+
# contains a 'docker-volumes' logical volume for Docker volume storage.
52+
# Default is false.
5553
#seed_lvm_group_data_enabled:
5654

5755
# Seed LVM volume group for data. See mrlesmithjr.manage_lvm role for format.

etc/kayobe/storage.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,8 @@
8181
#storage_lvm_groups_extra:
8282

8383
# Whether a 'data' LVM volume group should exist on storage hosts. By default
84-
# this contains a 'docker-volumes' logical volume for Docker volume storage. It
85-
# will also be used for Docker container and image storage if
86-
# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
87-
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
84+
# this contains a 'docker-volumes' logical volume for Docker volume storage.
85+
# Default is false.
8886
#storage_lvm_group_data_enabled:
8987

9088
# Storage LVM volume group for data. See mrlesmithjr.manage_lvm role for

0 commit comments

Comments
 (0)