Skip to content

Commit bd8c2ff

Browse files
Alex-WelshAlex-Welsh
committed
Merge upstream Caracal
1 parent ef27027 commit bd8c2ff

19 files changed

+139
-63
lines changed

‎.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/2023.1
5+
defaultbranch=stable/2024.1

‎etc/kayobe/bifrost.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
# DIB image OS release. Default is {{ os_release }}.
2929
#kolla_bifrost_dib_os_release:
3030

31-
# List of default DIB elements. Default is ["disable-selinux",
32-
# "enable-serial-console", "vm"] when os_distribution is "centos", or
33-
# ["enable-serial-console", "vm"] otherwise.
31+
# List of default DIB elements. Default is ["enable-serial-console", "vm"].
3432
#kolla_bifrost_dib_elements_default:
3533

3634
# List of additional DIB elements. Default is none.
@@ -71,6 +69,10 @@
7169
# Default is none.
7270
#kolla_bifrost_deploy_image_rootfs:
7371

72+
# Custom cloud-init user-data passed to deploy of the deployment image.
73+
# Default is an empty string.
74+
#kolla_bifrost_deploy_image_user_data_content:
75+
7476
###############################################################################
7577
# Ironic configuration.
7678

@@ -106,6 +108,12 @@
106108
# Ironic inspector IPMI password to set.
107109
#kolla_bifrost_inspector_ipmi_password:
108110

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+
109117
# Ironic inspector network interface name on which to check for an LLDP switch
110118
# port description to use as the node's name.
111119
#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: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,25 @@
66
# to setup the Kayobe user account. Default is {{ os_distribution }}.
77
#controller_bootstrap_user:
88

9+
###############################################################################
10+
# Controller groups.
11+
12+
# Ansible inventory group in which Ironic conductor services are deployed.
13+
# Default is 'controllers'.
14+
#controller_ironic_conductor_group:
15+
16+
# Ansible inventory group in which Ironic inspector services are deployed.
17+
# Default is 'controllers'.
18+
#controller_ironic_inspector_group:
19+
20+
# Ansible inventory group in which control plane load balancer services are
21+
# deployed. Default is 'network'.
22+
#controller_loadbalancer_group:
23+
24+
# Ansible inventory group in which network data plane services are deployed.
25+
# Default is 'network'.
26+
#controller_network_group:
27+
928
###############################################################################
1029
# Controller network interface configuration.
1130

@@ -86,9 +105,8 @@
86105

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

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

‎etc/kayobe/globals.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@
6464
# to not specify a gather subset.
6565
#kayobe_ansible_setup_gather_subset:
6666

67+
# Global maximum failure percentage. By default this is undefined, which is
68+
# equivalent to a value of 100.
69+
#kayobe_max_fail_percentage:
70+
6771
###############################################################################
6872
# Dummy variable to allow Ansible to accept this file.
6973
workaround_ansible_issue_8743: yes

‎etc/kayobe/grafana.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
###############################################################################
33
# Grafana configuration.
44

5-
# Grafana local admin user name. If you are deploying Monasca Grafana this
6-
# should not conflict with an OpenStack user name.
5+
# Grafana local admin user name.
76
#grafana_local_admin_user_name:
87

98
###############################################################################

‎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/inventory/groups‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,11 @@ controllers
5454
[storage]
5555
# Empty group to provide declaration of storage group.
5656

57-
[compute]
58-
# Empty group to provide declaration of compute group.
57+
[compute-vgpu]
58+
# Empty group to provide declaration of compute-vgpu group.
59+
60+
[compute:children]
61+
compute-vgpu
5962

6063
[overcloud:children]
6164
controllers
@@ -64,6 +67,14 @@ monitoring
6467
storage
6568
compute
6669

70+
###############################################################################
71+
# Feature control groups
72+
[vgpu:children]
73+
compute-vgpu
74+
75+
[iommu:children]
76+
vgpu
77+
6778
###############################################################################
6879
# Service groups.
6980

‎etc/kayobe/ipa.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424

2525
# List of default Diskimage Builder (DIB) elements to use when building IPA
2626
# images. Default is ["centos", "enable-serial-console",
27-
# "ironic-python-agent-ramdisk"].
27+
# "ironic-python-agent-ramdisk"] when os_distribution is "rocky", and
28+
# ["ubuntu", "enable-serial-console", "ironic-python-agent-ramdisk"] otherwise.
2829
#ipa_build_dib_elements_default:
2930

3031
# List of additional Diskimage Builder (DIB) elements to use when building IPA
@@ -49,15 +50,16 @@
4950
#ipa_build_dib_env:
5051

5152
# List of default git repositories containing Diskimage Builder (DIB) elements.
52-
# 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.
5355
#ipa_build_dib_git_elements_default:
5456

5557
# List of additional git repositories containing Diskimage Builder (DIB)
56-
# elements. See stackhpc.os-images role for usage. Default is empty.
58+
# elements. See stackhpc.openstack.os_images role for usage. Default is empty.
5759
#ipa_build_dib_git_elements_extra:
5860

5961
# List of git repositories containing Diskimage Builder (DIB) elements. See
60-
# stackhpc.os-images role for usage. Default is a combination of
62+
# stackhpc.openstack.os_images role for usage. Default is a combination of
6163
# ipa_build_dib_git_elements_default and ipa_build_dib_git_elements_extra.
6264
#ipa_build_dib_git_elements:
6365

0 commit comments

Comments
 (0)