Browse Source

Synchronise with Kayobe

Pulls in configuration from Kayobe prior to cutting a stable/rocky
branch.

Change-Id: Id61bc95f88ddfca6ffc919bae7345704497e26c4
tags/5.0.0
Mark Goddard 3 months ago
parent
commit
05226cbf58

+ 2
- 2
etc/kayobe/bifrost.yml View File

@@ -34,8 +34,8 @@
34 34
 ###############################################################################
35 35
 # Ironic configuration.
36 36
 
37
-# Whether to enable ipmitool-based drivers.
38
-#kolla_bifrost_enable_ipmitool_drivers:
37
+# List of hardware types to enable for Bifrost's Ironic.
38
+#kolla_bifrost_enabled_hardware_types:
39 39
 
40 40
 ###############################################################################
41 41
 # Ironic Inspector configuration.

+ 9
- 0
etc/kayobe/docker-registry.yml View File

@@ -5,6 +5,15 @@
5 5
 # Whether a docker registry is enabled.
6 6
 #docker_registry_enabled:
7 7
 
8
+# Dict of environment variables to provide to the docker registry container.
9
+# This allows to configure the registry by overriding specific configuration
10
+# options, as described at https://docs.docker.com/registry/configuration/
11
+# For example, the registry can be configured as a pull through cache to Docker
12
+# Hub by setting REGISTRY_PROXY_REMOTEURL to "https://registry-1.docker.io".
13
+# Note that it is not possible to push to a registry configured as a
14
+# pull through cache.
15
+#docker_registry_env:
16
+
8 17
 # The port on which the docker registry server should listen.
9 18
 #docker_registry_port:
10 19
 

+ 5
- 2
etc/kayobe/globals.yml View File

@@ -13,6 +13,9 @@
13 13
 # Base path for kayobe state on remote hosts.
14 14
 #base_path:
15 15
 
16
+# Path in which to store configuration on remote hosts.
17
+#config_path:
18
+
16 19
 # Path in which to cache downloaded images on remote hosts.
17 20
 #image_cache_path:
18 21
 
@@ -25,8 +28,8 @@
25 28
 ###############################################################################
26 29
 # User configuration.
27 30
 
28
-# User with which to access seed and controller nodes. This user will be
29
-# created if it does not exist.
31
+# User with which to access remote hosts. This user will be created if it does
32
+# not exist.
30 33
 #kayobe_ansible_user:
31 34
 
32 35
 ###############################################################################

+ 6
- 0
etc/kayobe/inventory/groups View File

@@ -53,6 +53,12 @@ monitoring
53 53
 storage
54 54
 compute
55 55
 
56
+[docker-registry:children]
57
+# Hosts in this group will have a Docker Registry deployed. This group should
58
+# generally contain only a single host, to avoid deploying multiple independent
59
+# registries which may become unsynchronized.
60
+seed
61
+
56 62
 ###############################################################################
57 63
 # Baremetal compute node groups.
58 64
 

+ 14
- 3
etc/kayobe/ironic.yml View File

@@ -2,9 +2,6 @@
2 2
 ###############################################################################
3 3
 # Ironic configuration.
4 4
 
5
-# List of enabled Ironic drivers.
6
-#kolla_ironic_drivers:
7
-
8 5
 # Specify the list of hardware types to load during service initialization.
9 6
 #kolla_ironic_enabled_hardware_types:
10 7
 
@@ -106,6 +103,20 @@
106 103
 # List of kernel parameters to append for baremetal PXE boot.
107 104
 #kolla_ironic_pxe_append_params:
108 105
 
106
+###############################################################################
107
+# Ironic Node Configuration
108
+
109
+# Whether or not to enable the serial consoles on post configure
110
+#ironic_serial_console_autoenable:
111
+
112
+# This defines the start of the range of TCP ports to used for the IPMI socat
113
+# serial consoles
114
+#ironic_serial_console_tcp_pool_start:
115
+
116
+# This defines the end of the range of TCP ports to used for the IPMI socat
117
+# serial consoles
118
+#ironic_serial_console_tcp_pool_end:
119
+
109 120
 ###############################################################################
110 121
 # Dummy variable to allow Ansible to accept this file.
111 122
 workaround_ansible_issue_8743: yes

+ 5
- 1
etc/kayobe/kolla.yml View File

@@ -57,7 +57,7 @@
57 57
 # Kolla base container image distribution.
58 58
 #kolla_base_distro:
59 59
 
60
-# Kolla installation type: binary or source.
60
+# Kolla container image type: binary or source.
61 61
 #kolla_install_type:
62 62
 
63 63
 # URL of docker registry to use for Kolla images.
@@ -260,6 +260,10 @@
260 260
 # Note that this should be formatted as a literal style block scalar.
261 261
 #kolla_tls_cert:
262 262
 
263
+# Path to a CA certificate file to use for the OS_CACERT environment variable in
264
+# openrc files when TLS is enabled, instead of Kolla-Ansible's default.
265
+#kolla_external_fqdn_cacert:
266
+
263 267
 ###############################################################################
264 268
 # Dummy variable to allow Ansible to accept this file.
265 269
 workaround_ansible_issue_8743: yes

+ 31
- 0
etc/kayobe/seed-hypervisor.yml View File

@@ -18,6 +18,37 @@
18 18
 # List of extra networks to which seed hypervisor nodes are attached.
19 19
 #seed_hypervisor_extra_network_interfaces:
20 20
 
21
+###############################################################################
22
+# Seed hypervisor node LVM configuration.
23
+
24
+# List of seed hypervisor volume groups. See mrlesmithjr.manage-lvm role for
25
+# format. Set to "{{ seed_hypervisor_lvm_groups_with_data }}" to create a
26
+# volume group for libvirt storage.
27
+#seed_hypervisor_lvm_groups:
28
+
29
+# Suggested list of seed hypervisor volume groups for libvirt. Not used by
30
+# default.
31
+#seed_hypervisor_lvm_groups_with_data:
32
+
33
+# Seed LVM volume group for data. See mrlesmithjr.manage-lvm role for format.
34
+#seed_hypervisor_lvm_group_data:
35
+
36
+# List of disks for use by seed hypervisor LVM data volume group. Default to an
37
+# invalid value to require configuration.
38
+#seed_hypervisor_lvm_group_data_disks:
39
+
40
+# List of LVM logical volumes for the data volume group.
41
+#seed_hypervisor_lvm_group_data_lvs:
42
+
43
+# Libvirt storage LVM backing volume.
44
+#seed_hypervisor_lvm_group_data_lv_libvirt_storage:
45
+
46
+# Size of libvirt storage LVM backing volume.
47
+#seed_hypervisor_lvm_group_data_lv_libvirt_storage_size:
48
+
49
+# Filesystem for libvirt storage LVM backing volume. ext4 allows for shrinking.
50
+#seed_hypervisor_lvm_group_data_lv_libvirt_storage_fs:
51
+
21 52
 ###############################################################################
22 53
 # Seed hypervisor libvirt storage pool configuration.
23 54
 

+ 4
- 0
etc/kayobe/yum.yml View File

@@ -1,4 +1,8 @@
1 1
 ---
2
+# Yum configuration. Dict mapping Yum config option names to their values.
3
+# yum_config:
4
+#   proxy: http://proxy.example.com
5
+#yum_config:
2 6
 
3 7
 # Whether or not to use a local Yum mirror.
4 8
 #yum_use_local_mirror: false

Loading…
Cancel
Save