From 6954eeb5ccc170b8831a32d20774893908c28952 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 14 Feb 2019 12:05:18 +0000 Subject: [PATCH] Synchronise with kayobe-config for Rocky Synchronises the configuration with kayobe-config prior to creating a stable/rocky branch. Change-Id: I9419bbcb1305f26195c1d0533b9e708de451742f --- etc/kayobe/bifrost.yml | 4 ++-- etc/kayobe/docker-registry.yml | 9 +++++++++ etc/kayobe/globals.yml | 7 +++++-- etc/kayobe/inventory/groups | 6 ++++++ etc/kayobe/ironic.yml | 17 ++++++++++++++--- etc/kayobe/kolla.yml | 6 +++++- etc/kayobe/seed-hypervisor.yml | 31 +++++++++++++++++++++++++++++++ etc/kayobe/yum.yml | 4 ++++ 8 files changed, 76 insertions(+), 8 deletions(-) diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml index ceffb27..271ebdc 100644 --- a/etc/kayobe/bifrost.yml +++ b/etc/kayobe/bifrost.yml @@ -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. diff --git a/etc/kayobe/docker-registry.yml b/etc/kayobe/docker-registry.yml index 0dd83c7..85308a4 100644 --- a/etc/kayobe/docker-registry.yml +++ b/etc/kayobe/docker-registry.yml @@ -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: diff --git a/etc/kayobe/globals.yml b/etc/kayobe/globals.yml index f3bbb77..592f574 100644 --- a/etc/kayobe/globals.yml +++ b/etc/kayobe/globals.yml @@ -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: ############################################################################### diff --git a/etc/kayobe/inventory/groups b/etc/kayobe/inventory/groups index cb9c906..a009693 100644 --- a/etc/kayobe/inventory/groups +++ b/etc/kayobe/inventory/groups @@ -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. diff --git a/etc/kayobe/ironic.yml b/etc/kayobe/ironic.yml index 0ee05b6..4bfdbe1 100644 --- a/etc/kayobe/ironic.yml +++ b/etc/kayobe/ironic.yml @@ -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 diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 1a3e29e..42eef89 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -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 diff --git a/etc/kayobe/seed-hypervisor.yml b/etc/kayobe/seed-hypervisor.yml index 93ccd5d..978a98c 100644 --- a/etc/kayobe/seed-hypervisor.yml +++ b/etc/kayobe/seed-hypervisor.yml @@ -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. diff --git a/etc/kayobe/yum.yml b/etc/kayobe/yum.yml index 2bc3201..985ab92 100644 --- a/etc/kayobe/yum.yml +++ b/etc/kayobe/yum.yml @@ -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