Sync kayobe-config-dev with kayobe changes

Depends-On: https://review.opendev.org/c/openstack/kayobe-config/+/787924
Change-Id: I8ab8e8364d22bec994f4901e5a796dd0ed9ecd07

etc/kayobe/apt.yml

@@ -0,0 +1,10 @@
+---
+###############################################################################
+# Apt package manager configuration.
+
+# Apt cache TTL in seconds. Default is 3600.
+#apt_cache_valid_time:
+
+###############################################################################
+# Dummy variable to allow Ansible to accept this file.
+workaround_ansible_issue_8743: yes

etc/kayobe/bifrost.yml

@@ -18,14 +18,16 @@
 ###############################################################################
 # Diskimage-builder configuration.
 
-# DIB base OS element. Default is "centos".
+# DIB base OS element. Default is {{ os_distribution }}.
 #kolla_bifrost_dib_os_element:
 
-# DIB image OS release. Default is "8".
+# DIB image OS release. Default is "focal" when os_distribution is "ubuntu", or
+# "8" otherwise.
 #kolla_bifrost_dib_os_release:
 
 # List of default DIB elements. Default is ["disable-selinux",
-# "enable-serial-console", "vm"].
+# "enable-serial-console", "vm"] when os_distribution is "centos", or
+# ["enable-serial-console", "vm"] otherwise.
 #kolla_bifrost_dib_elements_default:
 
 # List of additional DIB elements. Default is none.

etc/kayobe/compute.yml

@@ -3,7 +3,7 @@
 # Compute node configuration.
 
 # User with which to access the computes via SSH during bootstrap, in order
-# to setup the Kayobe user account.
+# to setup the Kayobe user account. Default is {{ os_distribution }}.
 #compute_bootstrap_user:
 
 ###############################################################################

etc/kayobe/controllers.yml

@@ -3,7 +3,7 @@
 # Controller node configuration.
 
 # User with which to access the controllers via SSH during bootstrap, in order
-# to setup the Kayobe user account.
+# to setup the Kayobe user account. Default is {{ os_distribution }}.
 controller_bootstrap_user: "{{ lookup('env', 'USER') }}"
 
 ###############################################################################

etc/kayobe/globals.yml

@@ -4,9 +4,19 @@
 ###############################################################################
 # Local path configuration (Ansible control host).
 
-# Path to Kayobe configuration directory on Ansible control host.
+# Path to Kayobe configuration directory on Ansible control host, with an
+# environment path appended if kayobe_environment is set.
 #kayobe_config_path:
 
+# Name of Kayobe environment to use. Default is $KAYOBE_ENVIRONMENT, or an
+# empty string if $KAYOBE_ENVIRONMENT is not set. Can also be set via the
+# --environment argument when invoking kayobe.
+#kayobe_environment:
+
+# Path to Kayobe configuration directory on Ansible control host with an
+# environment path appended if kayobe_environment is set.
+#kayobe_env_config_path:
+
 ###############################################################################
 # Remote path configuration (seed, seed-hypervisor and overcloud hosts).
 
@@ -32,6 +42,13 @@
 # not exist.
 #kayobe_ansible_user:
 
+###############################################################################
+# OS distribution.
+
+# OS distribution name. Valid options are "centos", "ubuntu". Default is
+# "centos".
+#os_distribution:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/ipa.yml

@@ -61,6 +61,10 @@
 # List of DIB packages to install. Default is none.
 #ipa_build_dib_packages:
 
+# Upper constraints file for installing packages in the virtual environment
+# used for building IPA images. Default is {{ pip_upper_constraints_file }}.
+#ipa_build_upper_constraints_file:
+
 ###############################################################################
 # Ironic Python Agent (IPA) images configuration.
 

etc/kayobe/ironic.yml

@@ -5,6 +5,13 @@
 # Specify the list of hardware types to load during service initialization.
 #kolla_ironic_enabled_hardware_types:
 
+# Specify the list of bios interfaces to load during service initialization.
+#kolla_ironic_enabled_bios_interfaces:
+
+# Default bios interface to be used for nodes that do not have bios_interface
+# field set.
+#kolla_ironic_default_bios_interface:
+
 # Specify the list of boot interfaces to load during service initialization.
 #kolla_ironic_enabled_boot_interfaces:
 

etc/kayobe/kolla.yml

@@ -61,7 +61,8 @@
 ###############################################################################
 # Kolla configuration.
 
-# Kolla base container image distribution. Default is 'centos'.
+# Kolla base container image distribution. Options are "centos", "debian",
+# "ubuntu". Default is {{ os_distribution }}.
 #kolla_base_distro:
 
 # Kolla container image type: binary or source. Default is 'binary'.
@@ -109,9 +110,9 @@
 # Dict mapping image customization variable names to their values.
 # Each variable takes the form:
 # <image name>_<customization>_<operation>
-# Hyphens in the image name are replaced with underscores. The customization is
+# Hyphens in the image name must be replaced with underscores. The
-# most commonly packages. The operation should be one of override, append or
+# customization is most commonly packages. The operation should be one of
-# remove. The value should be a list.
+# override, append or remove. The value should be a list.
 #kolla_build_customizations:
 
 ###############################################################################
@@ -208,8 +209,8 @@
 #kolla_enable_aodh:
 #kolla_enable_barbican:
 #kolla_enable_blazar:
-#kolla_enable_cadf_notifications:
 #kolla_enable_ceilometer:
+#kolla_enable_ceilometer_horizon_policy_file:
 #kolla_enable_ceilometer_ipmi:
 #kolla_enable_cells:
 #kolla_enable_central_logging:
@@ -222,24 +223,33 @@
 #kolla_enable_cinder_backend_quobyte:
 #kolla_enable_cinder_backend_zfssa_iscsi:
 #kolla_enable_cinder_backup:
+#kolla_enable_cinder_horizon_policy_file:
 #kolla_enable_cloudkitty:
 #kolla_enable_collectd:
+#kolla_enable_container_healthchecks:
 #kolla_enable_cyborg:
 #kolla_enable_designate:
 #kolla_enable_destroy_images:
 #kolla_enable_elasticsearch:
+#kolla_enable_elasticsearch_curator:
 #kolla_enable_etcd:
+#kolla_enable_external_mariadb_load_balancer:
 #kolla_enable_fluentd:
 #kolla_enable_freezer:
 #kolla_enable_glance:
+#kolla_enable_glance_horizon_policy_file:
+#kolla_enable_glance_image_cache:
 #kolla_enable_gnocchi:
+#kolla_enable_gnocchi_statsd:
 #kolla_enable_grafana:
+#kolla_enable_hacluster:
 #kolla_enable_haproxy:
+#kolla_enable_haproxy_memcached:
 #kolla_enable_heat:
+#kolla_enable_heat_horizon_policy_file:
 #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:
@@ -248,6 +258,7 @@
 #kolla_enable_horizon_manila:
 #kolla_enable_horizon_masakari:
 #kolla_enable_horizon_mistral:
+#kolla_enable_horizon_monasca:
 #kolla_enable_horizon_murano:
 #kolla_enable_horizon_neutron_vpnaas:
 #kolla_enable_horizon_octavia:
@@ -259,7 +270,6 @@
 #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:
@@ -269,6 +279,8 @@
 #kolla_enable_kafka:
 #kolla_enable_keepalived:
 #kolla_enable_keystone:
+#kolla_enable_keystone_federation:
+#kolla_enable_keystone_horizon_policy_file:
 #kolla_enable_kibana:
 #kolla_enable_kuryr:
 #kolla_enable_magnum:
@@ -276,6 +288,7 @@
 #kolla_enable_manila_backend_cephfs_native:
 #kolla_enable_manila_backend_cephfs_nfs:
 #kolla_enable_manila_backend_generic:
+#kolla_enable_manila_backend_glusterfs_nfs:
 #kolla_enable_manila_backend_hnas:
 #kolla_enable_mariabackup:
 #kolla_enable_mariadb:
@@ -289,6 +302,7 @@
 #kolla_enable_neutron_agent_ha:
 #kolla_enable_neutron_bgp_dragent:
 #kolla_enable_neutron_dvr:
+#kolla_enable_neutron_horizon_policy_file:
 #kolla_enable_neutron_infoblox_ipam_agent:
 #kolla_enable_neutron_metering:
 #kolla_enable_neutron_mlnx:
@@ -298,20 +312,36 @@
 #kolla_enable_neutron_segments:
 #kolla_enable_neutron_sfc:
 #kolla_enable_neutron_sriov:
+#kolla_enable_neutron_trunk:
 #kolla_enable_neutron_vpnaas:
 #kolla_enable_nova:
+#kolla_enable_nova_fake:
+#kolla_enable_nova_horizon_policy_file:
 #kolla_enable_nova_serialconsole_proxy:
 #kolla_enable_nova_ssh:
 #kolla_enable_octavia:
-#kolla_enable_onos:
+#kolla_enable_octavia_driver_agent:
 #kolla_enable_openstack_core:
 #kolla_enable_openvswitch:
 #kolla_enable_osprofiler:
 #kolla_enable_outward_rabbitmq:
+#kolla_enable_ovn:
 #kolla_enable_ovs_dpdk:
 #kolla_enable_panko:
 #kolla_enable_placement:
 #kolla_enable_prometheus:
+#kolla_enable_prometheus_alertmanager:
+#kolla_enable_prometheus_blackbox_exporter:
+#kolla_enable_prometheus_cadvisor:
+#kolla_enable_prometheus_ceph_mgr_exporter:
+#kolla_enable_prometheus_elasticsearch_exporter:
+#kolla_enable_prometheus_haproxy_exporter:
+#kolla_enable_prometheus_memcached_exporter:
+#kolla_enable_prometheus_mysqld_exporter:
+#kolla_enable_prometheus_node_exporter:
+#kolla_enable_prometheus_openstack_exporter:
+#kolla_enable_prometheus_rabbitmq_exporter:
+#kolla_enable_prometheus_server:
 #kolla_enable_qdrouterd:
 #kolla_enable_rabbitmq:
 #kolla_enable_rally:
@@ -322,6 +352,7 @@
 #kolla_enable_solum:
 #kolla_enable_storm:
 #kolla_enable_swift:
+#kolla_enable_swift_recon:
 #kolla_enable_swift_s3api:
 #kolla_enable_tacker:
 #kolla_enable_telegraf:
@@ -329,6 +360,7 @@
 #kolla_enable_trove:
 #kolla_enable_trove_singletenant:
 #kolla_enable_vitrage:
+#kolla_enable_vitrage_prometheus_datasource:
 #kolla_enable_vmtp:
 #kolla_enable_watcher:
 #kolla_enable_zookeeper:
@@ -345,6 +377,27 @@
 # passwords file.
 #kolla_ansible_custom_passwords:
 
+###############################################################################
+# OpenStack API addresses.
+
+# Virtual IP address of OpenStack internal API. Default is the vip_address
+# attribute of the internal network.
+#kolla_internal_vip_address:
+
+# Fully Qualified Domain Name (FQDN) of OpenStack internal API. Default is the
+# fqdn attribute of the internal network if set, otherwise
+# kolla_internal_vip_address.
+#kolla_internal_fqdn:
+
+# Virtual IP address of OpenStack external API. Default is the vip_address
+# attribute of the external network.
+#kolla_external_vip_address:
+
+# Fully Qualified Domain Name (FQDN) of OpenStack external API. Default is the
+# fqdn attribute of the external network if set, otherwise
+# kolla_external_vip_address.
+#kolla_external_fqdn:
+
 ###############################################################################
 # TLS certificate bundle management
 

etc/kayobe/ntp.yml

@@ -1,14 +0,0 @@
----
-# Kayobe NTP configuration.
-
-# Timezone configuration has moved to time.yml.
-#
-# Support for running an NTP daemon on the host is no longer available.
-# Instead the Kolla Ansible 'chrony' container is deployed by default. Set
-# 'kolla_enable_chrony' to 'false' in kolla.yml to disable it.
-#
-# This file will be removed in the Victoria release.
-
-###############################################################################
-# Dummy variable to allow Ansible to accept this file.
-workaround_ansible_issue_8743: yes

etc/kayobe/openstack.yml

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

etc/kayobe/overcloud.yml

@@ -16,17 +16,6 @@
 # To prevent some network issues you can choose to disable cloud-init
 #disable_cloud_init:
 
-###############################################################################
-# Overcloud host image configuration.
-
-# The CentOS cloud images have a bogus name server entry in /etc/resolv.conf,
-# 192.168.122.1. Cloud-init only appends name server entries to this file, and
-# will not remove this bogus entry. Typically this leads to a delay of around
-# 30 seconds when connecting via SSH, due to a timeout in NSS. The workaround
-# employed here is to remove this bogus entry from the image using
-# virt-customize, if it exists. See https://bugs.centos.org/view.php?id=14369.
-#overcloud_host_image_workaround_resolv_enabled:
-
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/seed-hypervisor.yml

@@ -3,7 +3,7 @@
 # Seed hypervisor node configuration.
 
 # User with which to access the seed hypervisor via SSH during bootstrap, in
-# order to setup the Kayobe user account.
+# order to setup the Kayobe user account. Default is {{ os_distribution }}.
 seed_hypervisor_bootstrap_user: "{{ lookup('env', 'USER') }}"
 
 ###############################################################################

etc/kayobe/seed-vm.yml

@@ -24,7 +24,10 @@
 #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.2.2004-20200611.2.x86_64.qcow2".
+# "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
+# when os_distribution is "ubuntu", or
+# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2"
+# otherwise.
 #seed_vm_root_image:
 
 # Capacity of the seed VM data volume.

etc/kayobe/seed.yml

@@ -3,7 +3,7 @@
 # Seed node configuration.
 
 # User with which to access the seed via SSH during bootstrap, in order to
-# setup the Kayobe user account.
+# setup the Kayobe user account. Default is {{ os_distribution }}.
 seed_bootstrap_user: "{{ lookup('env', 'USER') }}"
 
 ###############################################################################
@@ -92,8 +92,8 @@ seed_bootstrap_user: "{{ lookup('env', 'USER') }}"
 #   squid:
 #     name: "squid"
 #     image: "stackhpc/squid:3.5.20-1"
-#     pre: "{{ kayobe_config_path }}/containers/squid/pre.yml"
+#     pre: "{{ kayobe_env_config_path }}/containers/squid/pre.yml"
-#     post: "{{ kayobe_config_path }}/containers/squid/post.yml"
+#     post: "{{ kayobe_env_config_path }}/containers/squid/post.yml"
 #
 #seed_containers:
 

etc/kayobe/storage.yml

@@ -3,7 +3,7 @@
 # Storage node configuration.
 
 # User with which to access the storages via SSH during bootstrap, in order
-# to setup the Kayobe user account.
+# to setup the Kayobe user account. Default is {{ os_distribution }}.
 #storage_bootstrap_user:
 
 ###############################################################################