Synchronise with Kayobe

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

Change-Id: Id61bc95f88ddfca6ffc919bae7345704497e26c4
This commit is contained in:
Mark Goddard 2019-02-14 11:58:19 +00:00
parent 6bd6e7b1a9
commit 05226cbf58
8 changed files with 76 additions and 8 deletions

View File

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

View File

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

View File

@ -13,6 +13,9 @@
# Base path for kayobe state on remote hosts.
#base_path:
# Path in which to store configuration on remote hosts.
#config_path:
# Path in which to cache downloaded images on remote hosts.
#image_cache_path:
@ -25,8 +28,8 @@
###############################################################################
# User configuration.
# User with which to access seed and controller nodes. This user will be
# created if it does not exist.
# User with which to access remote hosts. This user will be created if it does
# not exist.
#kayobe_ansible_user:
###############################################################################

View File

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

View File

@ -2,9 +2,6 @@
###############################################################################
# Ironic configuration.
# List of enabled Ironic drivers.
#kolla_ironic_drivers:
# Specify the list of hardware types to load during service initialization.
#kolla_ironic_enabled_hardware_types:
@ -106,6 +103,20 @@
# List of kernel parameters to append for baremetal PXE boot.
#kolla_ironic_pxe_append_params:
###############################################################################
# Ironic Node Configuration
# Whether or not to enable the serial consoles on post configure
#ironic_serial_console_autoenable:
# This defines the start of the range of TCP ports to used for the IPMI socat
# serial consoles
#ironic_serial_console_tcp_pool_start:
# This defines the end of the range of TCP ports to used for the IPMI socat
# serial consoles
#ironic_serial_console_tcp_pool_end:
###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes

View File

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

View File

@ -18,6 +18,37 @@
# List of extra networks to which seed hypervisor nodes are attached.
#seed_hypervisor_extra_network_interfaces:
###############################################################################
# Seed hypervisor node LVM configuration.
# List of seed hypervisor volume groups. See mrlesmithjr.manage-lvm role for
# format. Set to "{{ seed_hypervisor_lvm_groups_with_data }}" to create a
# volume group for libvirt storage.
#seed_hypervisor_lvm_groups:
# Suggested list of seed hypervisor volume groups for libvirt. Not used by
# default.
#seed_hypervisor_lvm_groups_with_data:
# Seed LVM volume group for data. See mrlesmithjr.manage-lvm role for format.
#seed_hypervisor_lvm_group_data:
# List of disks for use by seed hypervisor LVM data volume group. Default to an
# invalid value to require configuration.
#seed_hypervisor_lvm_group_data_disks:
# List of LVM logical volumes for the data volume group.
#seed_hypervisor_lvm_group_data_lvs:
# Libvirt storage LVM backing volume.
#seed_hypervisor_lvm_group_data_lv_libvirt_storage:
# Size of libvirt storage LVM backing volume.
#seed_hypervisor_lvm_group_data_lv_libvirt_storage_size:
# Filesystem for libvirt storage LVM backing volume. ext4 allows for shrinking.
#seed_hypervisor_lvm_group_data_lv_libvirt_storage_fs:
###############################################################################
# Seed hypervisor libvirt storage pool configuration.

View File

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