Skip to content

Commit d1f8c7e

Browse files
committed
Sync with stackhpc/kayobe @ ae2e0ed2fc78c1a61d299b4f6c2aba5d190345bb
This includes config from backported changes.
1 parent fc052d9 commit d1f8c7e

File tree

10 files changed

+204
-5
lines changed

10 files changed

+204
-5
lines changed

etc/kayobe/apt.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,41 @@
1111
# Apt proxy URL for HTTPS. Default is {{ apt_proxy_http }}.
1212
#apt_proxy_https:
1313

14+
# List of Apt configuration options. Each item is a dict with the following
15+
# keys:
16+
# * content: free-form configuration file content
17+
# * filename: name of a file in /etc/apt/apt.conf.d/ in which to write the
18+
# configuration
19+
# Default is an empty list.
20+
#apt_config:
21+
22+
# List of apt keys. Each item is a dict containing the following keys:
23+
# * url: URL of key
24+
# * filename: Name of a file in which to store the downloaded key. The
25+
# extension should be '.asc' for ASCII-armoured keys, or '.gpg' otherwise.
26+
# Default is an empty list.
27+
#apt_keys:
28+
29+
# A list of Apt repositories. Each item is a dict with the following keys:
30+
# * types: whitespace-separated list of repository types, e.g. deb or deb-src
31+
# (optional, default is 'deb')
32+
# * url: URL of the repository
33+
# * suites: whitespace-separated list of suites, e.g. focal (optional, default
34+
# is ansible_facts.distribution_release)
35+
# * components: whitespace-separated list of components, e.g. main (optional,
36+
# default is 'main')
37+
# * signed_by: whitespace-separated list of names of GPG keyring files in
38+
# apt_keys_path (optional, default is unset)
39+
# * architecture: whitespace-separated list of architectures that will be used
40+
# (optional, default is unset)
41+
# Default is an empty list.
42+
#apt_repositories:
43+
44+
# Whether to disable repositories in /etc/apt/sources.list. This may be used
45+
# when replacing the distribution repositories via apt_repositories.
46+
# Default is false.
47+
#apt_disable_sources_list:
48+
1449
###############################################################################
1550
# Dummy variable to allow Ansible to accept this file.
1651
workaround_ansible_issue_8743: yes

etc/kayobe/bifrost.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ kolla_bifrost_source_version: "{{ stackhpc_bifrost_source_version }}"
6565
# Name of disk image file to deploy. Default is "deployment_image.qcow2".
6666
#kolla_bifrost_deploy_image_filename:
6767

68+
# UUID of the root filesystem contained within the deployment image.
69+
# See below URL for instructions on how to extract it:
70+
# https://docs.openstack.org/ironic/latest/admin/raid.html#image-requirements
71+
# Default is none.
72+
#kolla_bifrost_deploy_image_rootfs:
73+
6874
###############################################################################
6975
# Ironic configuration.
7076

etc/kayobe/compute.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,53 @@
143143
# - state: enabled
144144
#compute_firewalld_rules:
145145

146+
###############################################################################
147+
# Compute node host libvirt configuration.
148+
149+
# Whether to enable a host libvirt daemon. Default is true if kolla_enable_nova
150+
# is true and kolla_enable_nova_libvirt_container is false.
151+
#compute_libvirt_enabled:
152+
153+
# A dict of default configuration options to write to
154+
# /etc/libvirt/libvirtd.conf.
155+
#compute_libvirt_conf_default:
156+
157+
# A dict of additional configuration options to write to
158+
# /etc/libvirt/libvirtd.conf.
159+
#compute_libvirt_conf_extra:
160+
161+
# A dict of configuration options to write to /etc/libvirt/libvirtd.conf.
162+
# Default is a combination of compute_libvirt_conf_default and
163+
# compute_libvirt_conf_extra.
164+
#compute_libvirt_conf:
165+
166+
# Numerical log level for libvirtd. Default is 3.
167+
#compute_libvirtd_log_level:
168+
169+
# A dict of default configuration options to write to
170+
# /etc/libvirt/qemu.conf.
171+
#compute_qemu_conf_default:
172+
173+
# A dict of additional configuration options to write to
174+
# /etc/libvirt/qemu.conf.
175+
#compute_qemu_conf_extra:
176+
177+
# A dict of configuration options to write to /etc/libvirt/qemu.conf.
178+
# Default is a combination of compute_qemu_conf_default and
179+
# compute_qemu_conf_extra.
180+
#compute_qemu_conf:
181+
182+
# Whether to enable a libvirt TLS listener. Default is false.
183+
#compute_libvirt_enable_tls:
184+
185+
# Whether to install a Ceph package repository on CentOS and Rocky hosts.
186+
# Default is true.
187+
#compute_libvirt_ceph_repo_install:
188+
189+
# Ceph package repository release to install on CentOS and Rocky hosts when
190+
# compute_libvirt_ceph_repo_install is true. Default is 'pacific'.
191+
#compute_libvirt_ceph_repo_release:
192+
146193
###############################################################################
147194
# Dummy variable to allow Ansible to accept this file.
148195
workaround_ansible_issue_8743: yes

etc/kayobe/dnf.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,18 @@
1212
# Whether or not to use a local Yum mirror. Default value is 'false'.
1313
#dnf_use_local_mirror:
1414

15-
# Mirror FQDN for Yum repos. Default value is 'mirror.centos.org'.
15+
# Mirror FQDN for Yum CentOS repos. Default value is 'mirror.centos.org'.
1616
#dnf_centos_mirror_host:
1717

1818
# Mirror directory for Yum CentOS repos. Default value is 'centos'.
1919
#dnf_centos_mirror_directory:
2020

21+
# Mirror FQDN for Yum Rocky repos. Default value is 'dl.rockylinux.org'.
22+
#dnf_rocky_mirror_host:
23+
24+
# Mirror directory for Yum Rocky repos. Default value is 'pub/rocky'.
25+
#dnf_rocky_mirror_directory:
26+
2127
# Mirror FQDN for Yum EPEL repos. Default value is
2228
# 'download.fedoraproject.org'.
2329
#dnf_epel_mirror_host:

etc/kayobe/globals.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,13 @@
4545
###############################################################################
4646
# OS distribution.
4747

48-
# OS distribution name. Valid options are "centos", "ubuntu". Default is
49-
# "centos".
48+
# OS distribution name. Valid options are "centos", "rocky", "ubuntu". Default
49+
# is "centos".
5050
#os_distribution:
5151

5252
# OS release. Valid options are "8-stream" when os_distribution is "centos", or
53-
# "focal" when os_distribution is "ubuntu".
53+
# "8" when os_distribution is "rocky", or "focal" when os_distribution is
54+
# "ubuntu".
5455
#os_release:
5556

5657
###############################################################################

etc/kayobe/infra-vms.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
# Base image for the infra VM root volume. Default is
3333
# "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
3434
# when os_distribution is "ubuntu", or
35+
# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
36+
# when os_distribution is "rocky",
37+
# or
3538
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2"
3639
# otherwise.
3740
#infra_vm_root_image:

etc/kayobe/kolla.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ kolla_ansible_source_version: "{{ stackhpc_kolla_ansible_source_version }}"
5050
# Extra requirements to install inside the kolla-ansible virtualenv.
5151
#kolla_ansible_venv_extra_requirements:
5252

53+
# Pip requirement specifier for the ansible package. NOTE: This limits the
54+
# version of ansible used by kolla-ansible to avoid new releases from breaking
55+
# tested code. Changes to this limit should be tested.
56+
#kolla_ansible_venv_ansible:
57+
5358
# Path to Kolla-ansible configuration directory. Default is $KOLLA_CONFIG_PATH
5459
# or /etc/kolla if $KOLLA_CONFIG_PATH is not set.
5560
#kolla_config_path:
@@ -62,7 +67,8 @@ kolla_ansible_source_version: "{{ stackhpc_kolla_ansible_source_version }}"
6267
# Kolla configuration.
6368

6469
# Kolla base container image distribution. Options are "centos", "debian",
65-
# "ubuntu". Default is {{ os_distribution }}.
70+
# "ubuntu". Default is
71+
# {{ 'centos' if os_distribution == 'rocky' else os_distribution }}.
6672
#kolla_base_distro:
6773

6874
# Kolla container image type: binary or source. Default is 'source'.
@@ -617,6 +623,21 @@ kolla_build_customizations:
617623
# default.
618624
#kolla_internal_fqdn_cacert:
619625

626+
###############################################################################
627+
# Proxy configuration
628+
629+
# HTTP proxy URL (format: http(s)://[user:password@]proxy_name:port) used by
630+
# Kolla. Default value is "{{ http_proxy }}".
631+
#kolla_http_proxy:
632+
633+
# HTTPS proxy URL (format: http(s)://[user:password@]proxy_name:port) used by
634+
# Kolla. Default value is "{{ https_proxy }}".
635+
#kolla_https_proxy:
636+
637+
# List of domains, hostnames, IP addresses and networks for which no proxy is
638+
# used. Default value is "{{ no_proxy }}".
639+
#kolla_no_proxy:
640+
620641
###############################################################################
621642
# Dummy variable to allow Ansible to accept this file.
622643
workaround_ansible_issue_8743: yes

etc/kayobe/overcloud-dib.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
# Overcloud host disk image configuration.
3+
4+
###############################################################################
5+
# Diskimage-builder configuration for overcloud host disk images.
6+
7+
# Whether to build host disk images with DIB directly instead of through
8+
# Bifrost. Setting it to true disables Bifrost image build and allows images to
9+
# be built with the `kayobe overcloud host image build` command. Default value
10+
# is False. This will change in a future release.
11+
#overcloud_dib_build_host_images:
12+
13+
# DIB base OS element. Default is {{ os_distribution }}.
14+
#overcloud_dib_os_element:
15+
16+
# DIB image OS release. Default is {{ os_release }}.
17+
#overcloud_dib_os_release:
18+
19+
# List of default DIB elements. Default is ["centos", "cloud-init-datasources",
20+
# "disable-selinux", "enable-serial-console", "vm"] when
21+
# overcloud_dib_os_element is "centos", or ["ubuntu", "cloud-init-datasources",
22+
# "enable-serial-console", "vm"] when overcloud_dib_os_element is "ubuntu".
23+
#overcloud_dib_elements_default:
24+
25+
# List of additional DIB elements. Default is none.
26+
#overcloud_dib_elements_extra:
27+
28+
# List of DIB elements. Default is a combination of
29+
# overcloud_dib_elements_default and overcloud_dib_elements_extra.
30+
#overcloud_dib_elements:
31+
32+
# DIB default environment variables. Default is
33+
# {"DIB_BOOTLOADER_DEFAULT_CMDLINE": "nofb nomodeset gfxpayload=text
34+
# net.ifnames=1", "DIB_CLOUD_INIT_DATASOURCES": "ConfigDrive", "DIB_RELEASE":
35+
# "{{ overcloud_dib_os_release }}"}.
36+
#overcloud_dib_env_vars_default:
37+
38+
# DIB additional environment variables. Default is none.
39+
#overcloud_dib_env_vars_extra:
40+
41+
# DIB environment variables. Default is combination of
42+
# overcloud_dib_env_vars_default and overcloud_dib_env_vars_extra.
43+
#overcloud_dib_env_vars:
44+
45+
# List of DIB packages to install. Default is to install no extra packages.
46+
#overcloud_dib_packages:
47+
48+
# Upper constraints file for installing packages in the virtual environment
49+
# used for building overcloud host disk images. Default is {{
50+
# pip_upper_constraints_file }}.
51+
#overcloud_dib_upper_constraints_file:
52+
53+
###############################################################################
54+
# Dummy variable to allow Ansible to accept this file.
55+
workaround_ansible_issue_8743: yes

etc/kayobe/proxy.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
###############################################################################
3+
# Configuration of HTTP(S) proxies.
4+
5+
# HTTP proxy URL (format: http(s)://[user:password@]proxy_name:port). By
6+
# default no proxy is used.
7+
#http_proxy:
8+
9+
# HTTPS proxy URL (format: http(s)://[user:password@]proxy_name:port). By
10+
# default no proxy is used.
11+
#https_proxy:
12+
13+
# List of domains, hostnames, IP addresses and networks for which no proxy is
14+
# used. Defaults to ["127.0.0.1", "localhost", "{{ ('http://' ~
15+
# docker_registry) | urlsplit('hostname') }}"] if docker_registry is set, or
16+
# ["127.0.0.1", "localhost"] otherwise. This is configured only if either
17+
# http_proxy or https_proxy is set.
18+
#no_proxy:
19+
20+
###############################################################################
21+
# Dummy variable to allow Ansible to accept this file.
22+
workaround_ansible_issue_8743: yes

etc/kayobe/time.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
#
3131
#chrony_ntp_servers:
3232

33+
# Synchronise hardware clock with system time. Default is true.
34+
#chrony_rtcsync_enabled:
35+
3336
###############################################################################
3437
# Dummy variable to allow Ansible to accept this file.
3538
workaround_ansible_issue_8743: yes

0 commit comments

Comments
 (0)