Skip to content

Commit 62f6118

Browse files
priteaupriteau
committed
Sync kayobe-config with kayobe changes
Change-Id: Ia48cbd6a2c5b6b3e16ef4245fdebca2d7233b682
1 parent ace9a4d commit 62f6118

File tree

10 files changed

+106
-5
lines changed

10 files changed

+106
-5
lines changed

‎etc/kayobe/bifrost.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@
8686
#kolla_bifrost_inspector_port_addition:
8787

8888
# List of extra kernel parameters for the inspector default PXE configuration.
89+
# Default is {{ inspector_extra_kernel_options }}, defined in inspector.yml.
90+
# When customising this variable, the default extra kernel parameters should be
91+
# kept to retain full node inspection capabilities.
8992
#kolla_bifrost_inspector_extra_kernel_options:
9093

9194
# List of introspection rules for Bifrost's Ironic Inspector service.

‎etc/kayobe/infra-vms.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
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-
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2"
35+
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
3636
# otherwise.
3737
#infra_vm_root_image:
3838

‎etc/kayobe/ipa.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# URL of IPA builder source repository.
1717
#ipa_builder_source_url:
1818

19-
# Version of IPA builder source repository. Default is master.
19+
# Version of IPA builder source repository. Default is {{ openstack_branch }}.
2020
#ipa_builder_source_version:
2121

2222
# List of default Diskimage Builder (DIB) elements to use when building IPA

‎etc/kayobe/kolla.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,21 @@
479479
# default.
480480
#kolla_internal_fqdn_cacert:
481481

482+
###############################################################################
483+
# Proxy configuration
484+
485+
# HTTP proxy URL (format: http(s)://[user:password@]proxy_name:port) used by
486+
# Kolla. Default value is "{{ http_proxy }}".
487+
#kolla_http_proxy:
488+
489+
# HTTPS proxy URL (format: http(s)://[user:password@]proxy_name:port) used by
490+
# Kolla. Default value is "{{ https_proxy }}".
491+
#kolla_https_proxy:
492+
493+
# List of domains, hostnames, IP addresses and networks for which no proxy is
494+
# used. Default value is "{{ no_proxy }}".
495+
#kolla_no_proxy:
496+
482497
###############################################################################
483498
# Dummy variable to allow Ansible to accept this file.
484499
workaround_ansible_issue_8743: yes

‎etc/kayobe/networks.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,15 @@
196196
# 'name' items. These tables will be added to /etc/iproute2/rt_tables.
197197
#network_route_tables:
198198

199+
###############################################################################
200+
# Network connectivity check configuration.
201+
202+
# External IP address to check. Default is 8.8.8.8.
203+
#nc_external_ip:
204+
205+
# External hostname to check. Default is google.com.
206+
#nc_external_hostname:
207+
199208
###############################################################################
200209
# Dummy variable to allow Ansible to accept this file.
201210
workaround_ansible_issue_8743: yes

‎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 "xena".
5+
# Name of the current OpenStack release. Default is "master".
66
#openstack_release:
77

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

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

‎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: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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", "{{ docker_registry }}"]. This
15+
# is configured only if either http_proxy or https_proxy is set.
16+
#no_proxy:

‎etc/kayobe/seed-hypervisor.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
# List of extra networks to which seed hypervisor nodes are attached.
1919
#seed_hypervisor_extra_network_interfaces:
2020

21+
# Whether to enable SNAT on seed hypervisor node. Default is false.
22+
#seed_hypervisor_enable_snat:
23+
2124
###############################################################################
2225
# Seed hypervisor node software RAID configuration.
2326

‎etc/kayobe/seed-vm.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# Base image for the seed VM root volume. Default is
2727
# "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
2828
# when os_distribution is "ubuntu", or
29-
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2"
29+
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
3030
# otherwise.
3131
#seed_vm_root_image:
3232

0 commit comments

Comments
 (0)