Sync configs with kayobe @ 074024d63f9cb364ca16a7a7f0ac94d77ee9466b

Change-Id: I1c4e7c1bdcf40a066385f65341486abeb5c192b0

etc/kayobe/bifrost.yml

@@ -11,6 +11,10 @@
 # {{ openstack_branch }}.
 #kolla_bifrost_source_version:
 
+# Firewalld zone used by Bifrost. Default is "trusted", to avoid blocking other
+# services running on the seed host.
+#kolla_bifrost_firewalld_internal_zone:
+
 ###############################################################################
 # Diskimage-builder configuration.
 
@@ -54,6 +58,10 @@
 # List of hardware types to enable for Bifrost's Ironic.
 #kolla_bifrost_enabled_hardware_types:
 
+# List of extra kernel parameters for Bifrost's Ironic PXE configuration.
+# Default is empty.
+#kolla_bifrost_extra_kernel_options:
+
 ###############################################################################
 # Ironic Inspector configuration.
 
@@ -86,6 +94,10 @@
 # Ironic inspector deployment ramdisk location.
 #kolla_bifrost_inspector_deploy_ramdisk:
 
+# Timeout of hardware inspection on overcloud nodes, in seconds. Default is
+# {{ inspector_inspection_timeout }}.
+#kolla_bifrost_inspection_timeout:
+
 ###############################################################################
 # Ironic Python Agent (IPA) configuration.
 

etc/kayobe/ceph.yml

@@ -1,11 +0,0 @@
----
-###############################################################################
-# OpenStack Ceph configuration.
-
-# Ansible host pattern matching hosts on which Ceph storage services
-# are deployed. The default is to use hosts in the 'storage' group.
-#ceph_hosts:
-
-###############################################################################
-# Dummy variable to allow Ansible to accept this file.
-workaround_ansible_issue_8743: yes

etc/kayobe/compute.yml

@@ -7,7 +7,7 @@
 #compute_bootstrap_user:
 
 ###############################################################################
-# Network interface attachments.
+# Compute network interface configuration.
 
 # List of networks to which compute nodes are attached.
 #compute_network_interfaces:
@@ -75,6 +75,13 @@
 # for format.
 #compute_lvm_groups_extra:
 
+# Whether a 'data' LVM volume group should exist on compute hosts. By default
+# this contains a 'docker-volumes' logical volume for Docker volume storage. It
+# will also be used for Docker container and image storage if
+# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
+# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
+#compute_lvm_group_data_enabled:
+
 # Compute LVM volume group for data. See mrlesmithjr.manage-lvm role for
 # format.
 #compute_lvm_group_data:

etc/kayobe/controllers.yml

@@ -7,7 +7,7 @@
 #controller_bootstrap_user:
 
 ###############################################################################
-# Network interface attachments.
+# Controller network interface configuration.
 
 # List of networks to which controller nodes are attached.
 #controller_network_interfaces:
@@ -21,6 +21,12 @@
 # List of network interfaces to which network nodes are attached.
 #controller_network_host_network_interfaces:
 
+# List of default network interfaces to which network nodes are attached.
+#controller_network_host_default_network_interfaces:
+
+# List of extra networks to which network nodes are attached.
+#controller_network_host_extra_network_interfaces:
+
 ###############################################################################
 # Controller node BIOS configuration.
 
@@ -78,6 +84,13 @@
 # for format.
 #controller_lvm_groups_extra:
 
+# Whether a 'data' LVM volume group should exist on controller hosts. By
+# default this contains a 'docker-volumes' logical volume for Docker volume
+# storage. It will also be used for Docker container and image storage if
+# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
+# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
+#controller_lvm_group_data_enabled:
+
 # Controller LVM volume group for data. See mrlesmithjr.manage-lvm role for
 # format.
 #controller_lvm_group_data:

etc/kayobe/dnf.yml

@@ -4,10 +4,6 @@
 ###############################################################################
 # DNF repository configuration.
 
-# For backwards compatibility, all variables in this section default to the
-# equivalently named variables starting with 'yum_' instead of 'dnf_'.
-# The yum variables will be removed in a future release.
-
 # Yum configuration. Dict mapping Yum config option names to their values.
 # dnf_config:
 #   proxy: http://proxy.example.com
@@ -48,18 +44,11 @@
 ###############################################################################
 # DNF Automatic configuration.
 
-# For backwards compatibility, all variables in this section default to the
-# equivalently named variables starting with 'yum_cron' instead of
-# 'dnf_automatic'.  # The yum-cron variables will be removed in a future
-# release.
-
 # Whether DNF Automatic is enabled. This can be used to regularly apply
 # security updates. Default value is 'false'.
 #dnf_automatic_enabled:
 
-# DNF Automatic upgrade type. Default value is 'security'. Note that the
-# equivalent yum-cron variable is named slightly differently -
-# 'yum_cron_update_cmd'.
+# DNF Automatic upgrade type. Default value is 'security'.
 #dnf_automatic_upgrade_type:
 
 ###############################################################################

etc/kayobe/docker-registry.yml

@@ -2,7 +2,7 @@
 ###############################################################################
 # Docker registry configuration.
 
-# Whether a docker registry is enabled.
+# Whether a docker registry is enabled. Default is false.
 #docker_registry_enabled:
 
 # Dict of environment variables to provide to the docker registry container.
@@ -11,12 +11,32 @@
 # 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.
+# pull through cache. Default is an empty dict.
 #docker_registry_env:
 
-# The port on which the docker registry server should listen.
+# The port on which the docker registry server should listen. Default is 4000.
 #docker_registry_port:
 
+# Name or path to use as the volume for the docker registry. Default is
+# 'docker_registry'.
+#docker_registry_datadir_volume:
+
+# Whether to enable TLS for the registry. Default is false.
+#docker_registry_enable_tls:
+
+# Path to a TLS certificate to use when TLS is enabled. Default is none.
+#docker_registry_cert_path:
+
+# Path to a TLS key to use when TLS is enabled. Default is none.
+#docker_registry_key_path:
+
+# Whether to enable basic authentication for the registry. Default is false.
+#docker_registry_enable_basic_auth:
+
+# Path to a htpasswd formatted password store for the registry. Default is
+# none.
+#docker_registry_basic_auth_htpasswd_path:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/docker.yml

@@ -2,8 +2,8 @@
 ###############################################################################
 # Docker configuration.
 
-# Name of the docker storage driver. Default is 'devicemapper'.
-docker_storage_driver: overlay2
+# Name of the docker storage driver. Default is 'overlay2'.
+#docker_storage_driver:
 
 # Name of the docker storage LVM volume group.
 #docker_storage_volume_group:

etc/kayobe/inspector.yml

@@ -1,4 +1,11 @@
 ---
+###############################################################################
+# General configuration of inspection.
+
+# Timeout of hardware inspection on baremetal compute nodes, in seconds.
+# Default is 1200.
+#inspector_inspection_timeout:
+
 ###############################################################################
 # Ironic inspector PXE configuration.
 

etc/kayobe/ipa.yml

@@ -13,15 +13,24 @@
 # Version of IPA source repository. Default is {{ openstack_branch }}.
 #ipa_build_source_version:
 
+# URL of IPA builder source repository.
+#ipa_builder_source_url:
+
+# Version of IPA builder source repository. Default is master.
+#ipa_build_source_version:
+
 # List of default Diskimage Builder (DIB) elements to use when building IPA
-# images.
+# images. Default is ["centos", "enable-serial-console",
+# "ironic-python-agent-ramdisk"].
 #ipa_build_dib_elements_default:
 
 # List of additional Diskimage Builder (DIB) elements to use when building IPA
-# images.
+# images. Default is none.
 #ipa_build_dib_elements_extra:
 
 # List of Diskimage Builder (DIB) elements to use when building IPA images.
+# Default is combination of ipa_build_dib_elements_default and
+# ipa_build_dib_elements_extra.
 #ipa_build_dib_elements:
 
 # Dictionary of default environment variables to provide to Diskimage Builder
@@ -36,8 +45,17 @@
 # during IPA image build.
 #ipa_build_dib_env:
 
+# List of default git repositories containing Diskimage Builder (DIB) elements.
+# See stackhpc.os-images role for usage. Default is one item for IPA builder.
+#ipa_build_dib_git_elements_default:
+
+# List of additional git repositories containing Diskimage Builder (DIB)
+# elements. See stackhpc.os-images role for usage. Default is empty.
+#ipa_build_dib_git_elements_extra:
+
 # List of git repositories containing Diskimage Builder (DIB) elements. See
-# stackhpc.os-images role for usage.
+# stackhpc.os-images role for usage. Default is a combination of
+# ipa_build_dib_git_elements_default and ipa_build_dib_git_elements_extra.
 #ipa_build_dib_git_elements:
 
 # List of DIB packages to install. Default is none.

etc/kayobe/kolla.yml

@@ -120,6 +120,17 @@
 # Full custom seed inventory contents.
 #kolla_seed_inventory_custom:
 
+# List of names of host variables to pass through from kayobe hosts to
+# the kolla-ansible seed host, if set. See also
+# kolla_seed_inventory_pass_through_host_vars_map.
+#kolla_seed_inventory_pass_through_host_vars:
+
+# Dict mapping names of variables in
+# kolla_seed_inventory_pass_through_host_vars to the variable to use in
+# kolla-ansible. If a variable name is not in this mapping the kayobe name is
+# used.
+#kolla_seed_inventory_pass_through_host_vars_map:
+
 # Custom overcloud inventory containing a mapping from top level groups to
 # hosts.
 #kolla_overcloud_inventory_custom_top_level:
@@ -146,6 +157,17 @@
 # have no hosts mapped to them will be provided with an empty group definition.
 #kolla_overcloud_inventory_kolla_top_level_groups:
 
+# List of names of host variables to pass through from kayobe hosts to
+# kolla-ansible hosts, if set. See also
+# kolla_overcloud_inventory_pass_through_host_vars_map.
+#kolla_overcloud_inventory_pass_through_host_vars:
+
+# Dict mapping names of variables in
+# kolla_overcloud_inventory_pass_through_host_vars to the variable to use in
+# kolla-ansible. If a variable name is not in this mapping the kayobe name is
+# used.
+#kolla_overcloud_inventory_pass_through_host_vars_map:
+
 ###############################################################################
 # Kolla-ansible configuration.
 
@@ -188,64 +210,117 @@
 #kolla_enable_blazar:
 #kolla_enable_cadf_notifications:
 #kolla_enable_ceilometer:
+#kolla_enable_ceilometer_ipmi:
+#kolla_enable_cells:
 #kolla_enable_central_logging:
 #kolla_enable_chrony:
 #kolla_enable_cinder:
-#kolla_enable_cinder_backend_hnas_iscsi:
 #kolla_enable_cinder_backend_hnas_nfs:
 #kolla_enable_cinder_backend_iscsi:
 #kolla_enable_cinder_backend_lvm:
 #kolla_enable_cinder_backend_nfs:
+#kolla_enable_cinder_backend_quobyte:
 #kolla_enable_cinder_backend_zfssa_iscsi:
+#kolla_enable_cinder_backup:
 #kolla_enable_cloudkitty:
-#kolla_enable_congress:
+#kolla_enable_collectd:
+#kolla_enable_cyborg:
 #kolla_enable_designate:
+#kolla_enable_destroy_images:
+#kolla_enable_elasticsearch:
 #kolla_enable_etcd:
 #kolla_enable_fluentd:
 #kolla_enable_freezer:
+#kolla_enable_glance:
 #kolla_enable_gnocchi:
 #kolla_enable_grafana:
 #kolla_enable_haproxy:
 #kolla_enable_heat:
 #kolla_enable_horizon:
+#kolla_enable_horizon_blazar:
+#kolla_enable_horizon_cloudkitty:
+#kolla_enable_horizon_congress:
+#kolla_enable_horizon_designate:
+#kolla_enable_horizon_freezer:
+#kolla_enable_horizon_heat:
+#kolla_enable_horizon_ironic:
+#kolla_enable_horizon_karbor:
+#kolla_enable_horizon_magnum:
+#kolla_enable_horizon_manila:
+#kolla_enable_horizon_masakari:
+#kolla_enable_horizon_mistral:
+#kolla_enable_horizon_murano:
+#kolla_enable_horizon_neutron_vpnaas:
+#kolla_enable_horizon_octavia:
+#kolla_enable_horizon_qinling:
+#kolla_enable_horizon_sahara:
+#kolla_enable_horizon_searchlight:
+#kolla_enable_horizon_senlin:
+#kolla_enable_horizon_solum:
+#kolla_enable_horizon_tacker:
+#kolla_enable_horizon_trove:
+#kolla_enable_horizon_vitrage:
+#kolla_enable_horizon_watcher:
+#kolla_enable_horizon_zun:
+#kolla_enable_hyperv:
 #kolla_enable_influxdb:
 #kolla_enable_ironic:
 #kolla_enable_ironic_ipxe:
+#kolla_enable_ironic_neutron_agent:
 #kolla_enable_ironic_pxe_uefi:
 #kolla_enable_iscsid:
+#kolla_enable_kafka:
 #kolla_enable_karbor:
+#kolla_enable_keepalived:
 #kolla_enable_keystone:
+#kolla_enable_kibana:
 #kolla_enable_kuryr:
 #kolla_enable_magnum:
 #kolla_enable_manila:
-#kolla_enable_manila_backend_generic:
-#kolla_enable_manila_backend_hnas:
 #kolla_enable_manila_backend_cephfs_native:
 #kolla_enable_manila_backend_cephfs_nfs:
+#kolla_enable_manila_backend_generic:
+#kolla_enable_manila_backend_hnas:
 #kolla_enable_mariabackup:
+#kolla_enable_mariadb:
+#kolla_enable_masakari:
+#kolla_enable_memcached:
 #kolla_enable_mistral:
 #kolla_enable_monasca:
-#kolla_enable_mongodb:
 #kolla_enable_multipathd:
 #kolla_enable_murano:
+#kolla_enable_neutron:
 #kolla_enable_neutron_agent_ha:
 #kolla_enable_neutron_bgp_dragent:
 #kolla_enable_neutron_dvr:
-#kolla_enable_neutron_fwaas:
-#kolla_enable_neutron_lbaas:
+#kolla_enable_neutron_infoblox_ipam_agent:
+#kolla_enable_neutron_metering:
+#kolla_enable_neutron_mlnx:
+#kolla_enable_neutron_port_forwarding:
 #kolla_enable_neutron_provider_networks:
 #kolla_enable_neutron_qos:
 #kolla_enable_neutron_segments:
+#kolla_enable_neutron_sfc:
 #kolla_enable_neutron_sriov:
 #kolla_enable_neutron_vpnaas:
+#kolla_enable_nova:
 #kolla_enable_nova_serialconsole_proxy:
+#kolla_enable_nova_ssh:
 #kolla_enable_octavia:
+#kolla_enable_onos:
 #kolla_enable_openstack_core:
+#kolla_enable_openvswitch:
 #kolla_enable_osprofiler:
+#kolla_enable_outward_rabbitmq:
+#kolla_enable_ovs_dpdk:
 #kolla_enable_panko:
+#kolla_enable_placement:
 #kolla_enable_prometheus:
 #kolla_enable_qdrouterd:
+#kolla_enable_qinling:
+#kolla_enable_rabbitmq:
 #kolla_enable_rally:
+#kolla_enable_redis:
 #kolla_enable_sahara:
 #kolla_enable_searchlight:
 #kolla_enable_senlin:
@@ -253,13 +328,16 @@
 #kolla_enable_solum:
 #kolla_enable_storm:
 #kolla_enable_swift:
+#kolla_enable_swift_s3api:
 #kolla_enable_tacker:
 #kolla_enable_telegraf:
 #kolla_enable_tempest:
 #kolla_enable_trove:
+#kolla_enable_trove_singletenant:
 #kolla_enable_vitrage:
 #kolla_enable_vmtp:
 #kolla_enable_watcher:
+#kolla_enable_zookeeper:
 #kolla_enable_zun:
 
 ###############################################################################

etc/kayobe/openstack.yml

@@ -2,10 +2,10 @@
 ###############################################################################
 # OpenStack release configuration.
 
-# Name of the current OpenStack release. Default is "ussuri".
+# Name of the current OpenStack release. Default is "victoria".
 #openstack_release:
 
-# Name of the current OpenStack branch. Default is "stable/ussuri".
+# Name of the current OpenStack branch. Default is "stable/victoria".
 #openstack_branch:
 
 ###############################################################################

etc/kayobe/seed-vm.yml

@@ -24,7 +24,7 @@
 #seed_vm_root_format:
 
 # Base image for the seed VM root volume. Default is
-# "https://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.1.1911-20200113.3.x86_64.qcow2".
+# "https://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.2.2004-20200611.2.x86_64.qcow2".
 #seed_vm_root_image:
 
 # Capacity of the seed VM data volume.
@@ -33,6 +33,22 @@
 # Format of the seed VM data volume.
 #seed_vm_data_format:
 
+# List of network interfaces to attach to the seed VM. Format is as accepted by
+# the stackhpc.libvirt-vm role's libvirt_vms.interfaces variable. Default is
+# one interface for each network in 'network_interfaces'.
+#
+# Example with one interface connected to a libvirt network called
+# 'libvirt-net', and another interface directly plugged into a host device
+# called 'eth1':
+#
+# seed_vm_interfaces:
+#   - network: libvirt-net
+#   - type: direct
+#     source:
+#       dev: eth1
+#
+#seed_vm_interfaces:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/seed.yml

@@ -7,7 +7,7 @@
 #seed_bootstrap_user:
 
 ###############################################################################
-# Network interface attachments.
+# Seed network interface configuration.
 
 # List of networks to which seed nodes are attached.
 #seed_network_interfaces:
@@ -31,24 +31,31 @@
 #seed_luks_devices:
 
 ###############################################################################
-# LVM configuration.
+# Seed node LVM configuration.
 
-# List of seed volume groups. See mrlesmithjr.manage-lvm role for
-# format.
+# List of seed volume groups. See mrlesmithjr.manage-lvm role for format.
 #seed_lvm_groups:
 
 # Default list of seed volume groups. See mrlesmithjr.manage-lvm role for
 # format.
 #seed_lvm_groups_default:
 
-# Additional list of seed volume groups. See mrlesmithjr.manage-lvm role
-# for format.
+# Additional list of seed volume groups. See mrlesmithjr.manage-lvm role for
+# format.
 #seed_lvm_groups_extra:
 
+# Whether a 'data' LVM volume group should exist on the seed. By default this
+# contains a 'docker-volumes' logical volume for Docker volume storage. It will
+# also be used for Docker container and image storage if
+# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
+# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
+#seed_lvm_group_data_enabled:
+
 # Seed LVM volume group for data. See mrlesmithjr.manage-lvm role for format.
 #seed_lvm_group_data:
 
-# List of disks for use by seed LVM data volume group.
+# List of disks for use by seed LVM data volume group. Default to an invalid
+# value to require configuration.
 #seed_lvm_group_data_disks:
 
 # List of LVM logical volumes for the data volume group.
@@ -76,6 +83,20 @@
 # singleplatform-eng.users role.
 #seed_users:
 
+###############################################################################
+# Seed node additional containers configuration
+
+# Dict of container images to start
+# Example:
+# seed_containers:
+#   squid:
+#     name: "squid"
+#     image: "stackhpc/squid:3.5.20-1"
+#     pre: "{{ kayobe_config_path }}/containers/squid/pre.yml"
+#     post: "{{ kayobe_config_path }}/containers/squid/post.yml"
+#
+#seed_containers:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/storage.yml

@@ -7,7 +7,7 @@
 #storage_bootstrap_user:
 
 ###############################################################################
-# Network interface attachments.
+# Storage network interface configuration.
 
 # List of networks to which storage nodes are attached.
 #storage_network_interfaces:
@@ -80,6 +80,13 @@
 # for format.
 #storage_lvm_groups_extra:
 
+# Whether a 'data' LVM volume group should exist on storage hosts. By default
+# this contains a 'docker-volumes' logical volume for Docker volume storage. It
+# will also be used for Docker container and image storage if
+# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
+# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
+#storage_lvm_group_data_enabled:
+
 # Storage LVM volume group for data. See mrlesmithjr.manage-lvm role for
 # format.
 #storage_lvm_group_data:

etc/kayobe/yum-cron.yml

@@ -1,12 +0,0 @@
----
-# DEPRECATED: Variables in this file are deprecated and will be removed in a
-# future release. Please use dnf.yml instead.
-
-# Whether to enable Yum automatic updates.
-#yum_cron_enabled: false
-# Command to use for Yum automatic updates.
-#yum_cron_update_cmd: 'security'
-
-###############################################################################
-# Dummy variable to allow Ansible to accept this file.
-workaround_ansible_issue_8743: yes

etc/kayobe/yum.yml

@@ -1,40 +0,0 @@
----
-# DEPRECATED: Variables in this file are deprecated and will be removed in a
-# future release. Please use dnf.yml instead.
-
-# 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
-
-# Mirror FQDN for Yum repos.
-#yum_centos_mirror_host: 'mirror.centos.org'
-
-# Mirror directory for Yum CentOS repos.
-#yum_centos_mirror_directory: 'centos'
-# Mirror FQDN for Yum EPEL repos.
-#yum_epel_mirror_host: 'download.fedoraproject.org'
-# Mirror directory for Yum EPEL repos.
-#yum_epel_mirror_directory: 'pub/epel'
-# A dict of custom repositories.
-# You can see params on
-# http://docs.ansible.com/ansible/latest/modules/yum_repository_module.html.
-# For example:
-# yum_custom_repos:
-#   reponame:
-#     baseurl: http://repo
-#     file: myrepo
-#     gpgkey: http://gpgkey
-#     gpgcheck: yes
-#yum_custom_repos:
-
-# Whether to install the epel-release package. This affects RedHat-based
-# systems only.
-#yum_install_epel:
-
-###############################################################################
-# Dummy variable to allow Ansible to accept this file.
-workaround_ansible_issue_8743: yes