[release] Sync kayobe-config-dev with kayobe changes

Change-Id: Iefdf14be37c4c66accf381f9a81c12d9588a1610

etc/kayobe/apt.yml

@@ -30,7 +30,7 @@
 # * types: whitespace-separated list of repository types, e.g. deb or deb-src
 #   (optional, default is 'deb')
 # * url: URL of the repository
-# * suites: whitespace-separated list of suites, e.g. focal (optional, default
+# * suites: whitespace-separated list of suites, e.g. jammy (optional, default
 #   is ansible_facts.distribution_release)
 # * components: whitespace-separated list of components, e.g. main (optional,
 #   default is 'main')

etc/kayobe/compute.yml

@@ -179,6 +179,12 @@
 # compute_qemu_conf_extra.
 #compute_qemu_conf:
 
+# Whether to enable libvirt SASL authentication. Default is true.
+#compute_libvirt_enable_sasl: true
+
+# libvirt SASL password. Default is unset.
+#compute_libvirt_sasl_password:
+
 # Whether to enable a libvirt TLS listener. Default is false.
 #compute_libvirt_enable_tls:
 

etc/kayobe/globals.yml

@@ -46,11 +46,11 @@
 # OS distribution.
 
 # OS distribution name. Valid options are "centos", "rocky", "ubuntu". Default
-# is "centos".
+# is "rocky".
 os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
 
-# OS release. Valid options are "8-stream" when os_distribution is "centos", or
-# "8" when os_distribution is "rocky", or "focal" when os_distribution is
+# OS release. Valid options are "9-stream" when os_distribution is "centos", or
+# "9" when os_distribution is "rocky", or "jammy" when os_distribution is
 # "ubuntu".
 #os_release:
 

etc/kayobe/grafana.yml

@@ -6,42 +6,6 @@
 # should not conflict with an OpenStack user name.
 #grafana_local_admin_user_name:
 
-# Path to git repo containing Grafana dashboards. Eg.
-# https://github.com/stackhpc/grafana-reference-dashboards.git
-#grafana_monitoring_node_dashboard_repo:
-
-# Dashboard repo version. Optional, defaults to 'HEAD'.
-#grafana_monitoring_node_dashboard_repo_version:
-
-# Path to which Grafana dashboards will be cloned to a monitoring node
-#grafana_monitoring_node_dashboard_repo_checkout_path:
-
-# The path, relative to the grafana_monitoring_node_dashboard_repo_checkout_path
-# containing the dashboards. Eg. /prometheus/control_plane
-#grafana_monitoring_node_dashboard_repo_path:
-
-# The Grafana organisation for the control plane. Note that for Monasca
-# Grafana with domain support the format is:
-# organisation_name@openstack_domain
-#grafana_control_plane_organisation:
-
-# A dict of datasources to configure. See the stackhpc.grafana-conf role
-# for all supported datasources. Example:
-#
-# grafana_datasources:
-#   monasca_api:
-#     port: 8082
-#     host: monasca-api
-#   monasca_log_api:
-#     port: 5607
-#     host: monasca-log-api
-#   elasticsearch:
-#     port: 9200
-#     host: monasca-elasticsearch
-#     project_id: "some_id"
-#
-#grafana_datasources:
-
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/infra-vms.yml

@@ -30,12 +30,12 @@
 #infra_vm_root_format:
 
 # Base image for the infra VM root volume. Default is
-# "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
+# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu", or
-# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
+# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
 

etc/kayobe/inspector.yml

@@ -84,9 +84,6 @@
 # Ironic inspector rule to set deployment ramdisk.
 #inspector_rule_deploy_ramdisk:
 
-# Ironic inspector rule to set local boot capability
-#inspector_rule_local_boot:
-
 # Ironic inspector rule to initialise root device hints.
 #inspector_rule_root_hint_init:
 

etc/kayobe/inventory/group_vars/compute/network-interfaces

@@ -2,25 +2,18 @@
 ###############################################################################
 # Network interface definitions for the compute group.
 
-# Overcloud provisioning network IP information.
-# provision_oc_net_interface:
-# provision_oc_net_bridge_ports:
-# provision_oc_net_bond_slaves:
-
-# Internal network IP information.
-# internal_net_interface:
-# internal_net_bridge_ports:
-# internal_net_bond_slaves:
-
-# External network IP information.
-# external_net_interface:
-# external_net_bridge_ports:
-# external_net_bond_slaves:
-
-# Storage network IP information.
-# storage_net_interface:
-# storage_net_bridge_ports:
-# storage_net_bond_slaves:
+# NOTE: The content of this section is very deployment-specific, since it
+# depends on the names and types of networks in the deployment. It should
+# define the group-specific attributes of networks. The following example shows
+# a basic configuration for a network called "example":
+#
+# example_interface: eth0
+#
+# Global network attributes such as subnet CIDRs are typically configured in
+# etc/kayobe/networks.yml.
+#
+# Further information on the available network attributes is provided in the
+# network configuration reference in the Kayobe documentation.
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

etc/kayobe/inventory/group_vars/infra-vms/network-interfaces

@@ -2,10 +2,18 @@
 ###############################################################################
 # Network interface definitions for the infra-vms group.
 
-# Overcloud provisioning network IP information.
-# provision_oc_net_interface:
-# provision_oc_net_bridge_ports:
-# provision_oc_net_bond_slaves:
+# NOTE: The content of this section is very deployment-specific, since it
+# depends on the names and types of networks in the deployment. It should
+# define the group-specific attributes of networks. The following example shows
+# a basic configuration for a network called "example":
+#
+# example_interface: eth0
+#
+# Global network attributes such as subnet CIDRs are typically configured in
+# etc/kayobe/networks.yml.
+#
+# Further information on the available network attributes is provided in the
+# network configuration reference in the Kayobe documentation.
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

etc/kayobe/inventory/group_vars/seed-hypervisor/network-interfaces

@@ -1,3 +1,10 @@
 ---
+###############################################################################
+# Network interface definitions for the seed-hypervisor group.
+
 aio_interface: braio
 aio_bridge_ports: []
+
+###############################################################################
+# Dummy variable to allow Ansible to accept this file.
+workaround_ansible_issue_8743: yes

etc/kayobe/inventory/group_vars/storage/network-interfaces

@@ -2,35 +2,18 @@
 ###############################################################################
 # Network interface definitions for the storage group.
 
-# Overcloud provisioning network IP information.
-# provision_oc_net_interface:
-# provision_oc_net_bridge_ports:
-# provision_oc_net_bond_slaves:
-
-# External network IP information.
-# external_net_interface:
-# external_net_bridge_ports:
-# external_net_bond_slaves:
-
-# Storage network IP information.
-# storage_net_interface:
-# storage_net_bridge_ports:
-# storage_net_bond_slaves:
-
-# Storage management network IP information.
-# storage_mgmt_net_interface:
-# storage_mgmt_net_bridge_ports:
-# storage_mgmt_net_bond_slaves:
-
-# Swift storage network IP information.
-# swift_storage_net_interface:
-# swift_storage_net_bridge_ports:
-# swift_storage_net_bond_slaves:
-
-# Swift storage management network IP information.
-# swift_storage_replication_net_interface:
-# swift_storage_replication_net_bridge_ports:
-# swift_storage_replication_net_bond_slaves:
+# NOTE: The content of this section is very deployment-specific, since it
+# depends on the names and types of networks in the deployment. It should
+# define the group-specific attributes of networks. The following example shows
+# a basic configuration for a network called "example":
+#
+# example_interface: eth0
+#
+# Global network attributes such as subnet CIDRs are typically configured in
+# etc/kayobe/networks.yml.
+#
+# Further information on the available network attributes is provided in the
+# network configuration reference in the Kayobe documentation.
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

etc/kayobe/ipa.yml

@@ -19,6 +19,9 @@
 # Version of IPA builder source repository. Default is {{ openstack_branch }}.
 #ipa_builder_source_version:
 
+# List of additional build host packages to install. Default is an empty list.
+#ipa_build_dib_host_packages_extra:
+
 # List of default Diskimage Builder (DIB) elements to use when building IPA
 # images. Default is ["centos", "enable-serial-console",
 # "ironic-python-agent-ramdisk"].
@@ -65,6 +68,10 @@
 # used for building IPA images. Default is {{ pip_upper_constraints_file }}.
 #ipa_build_upper_constraints_file:
 
+# Upper constraints file for installation of DIB to build IPA images.
+# Default is empty string.
+#ipa_build_dib_upper_constraints_file:
+
 ###############################################################################
 # Ironic Python Agent (IPA) images configuration.
 

etc/kayobe/ironic.yml

@@ -91,10 +91,6 @@
 # vendor_interface field set.
 #kolla_ironic_default_vendor_interface:
 
-# Default boot option to use when no boot option is requested in node's
-# driver_info.
-#kolla_ironic_default_boot_option:
-
 # Name of the Neutron network to use for cleaning.
 #kolla_ironic_cleaning_network:
 

etc/kayobe/kolla.yml

@@ -67,12 +67,16 @@
 # Kolla configuration.
 
 # Kolla base container image distribution. Options are "centos", "debian",
-# "ubuntu". Default is
-# {{ 'centos' if os_distribution == 'rocky' else os_distribution }}.
+# "rocky", "ubuntu". Default is {{ os_distribution }}.
 #kolla_base_distro:
 
-# Kolla container image type: binary or source. Default is 'source'.
-#kolla_install_type:
+# Kolla base container image distribution version default map.
+# Defines default versions for each distribution.
+#kolla_base_distro_version_default_map:
+
+# Kolla base container image distribution version.
+# Default is kolla_base_distro_version_default_map[kolla_base_distro].
+#kolla_base_distro_version:
 
 # URL of docker registry to use for Kolla images. Default is not set, in which
 # case Dockerhub will be used.
@@ -102,8 +106,8 @@
 # {{ kolla_openstack_release }}.
 #kolla_tag:
 
-# Dict mapping names of sources to their definitions for
-# kolla_install_type=source. See kolla.common.config for details.
+# Dict mapping names of sources to their definitions.
+# See kolla.common.config for details.
 # Example:
 # kolla_sources:
 #   ironic-base:
@@ -277,6 +281,9 @@
 #kolla_enable_cinder_backend_iscsi:
 #kolla_enable_cinder_backend_lvm:
 #kolla_enable_cinder_backend_nfs:
+#kolla_enable_cinder_backend_pure_fc:
+#kolla_enable_cinder_backend_pure_iscsi:
+#kolla_enable_cinder_backend_pure_roce:
 #kolla_enable_cinder_backend_quobyte:
 #kolla_enable_cinder_backup:
 #kolla_enable_cinder_horizon_policy_file:
@@ -286,9 +293,8 @@
 #kolla_enable_cyborg:
 #kolla_enable_designate:
 #kolla_enable_destroy_images:
-#kolla_enable_elasticsearch:
-#kolla_enable_elasticsearch_curator:
 #kolla_enable_etcd:
+#kolla_enable_external_api_firewalld:
 #kolla_enable_external_mariadb_load_balancer:
 #kolla_enable_fluentd:
 #kolla_enable_freezer:
@@ -298,6 +304,7 @@
 #kolla_enable_gnocchi:
 #kolla_enable_gnocchi_statsd:
 #kolla_enable_grafana:
+#kolla_enable_grafana_external:
 #kolla_enable_hacluster:
 #kolla_enable_haproxy:
 #kolla_enable_haproxy_memcached:
@@ -314,7 +321,6 @@
 #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:
@@ -331,12 +337,10 @@
 #kolla_enable_ironic_neutron_agent:
 #kolla_enable_ironic_pxe_uefi:
 #kolla_enable_iscsid:
-#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_loadbalancer:
 #kolla_enable_magnum:
@@ -349,9 +353,10 @@
 #kolla_enable_mariabackup:
 #kolla_enable_mariadb:
 #kolla_enable_masakari:
+#kolla_enable_masakari_hostmonitor:
+#kolla_enable_masakari_instancemonitor:
 #kolla_enable_memcached:
 #kolla_enable_mistral:
-#kolla_enable_monasca:
 #kolla_enable_multipathd:
 #kolla_enable_murano:
 #kolla_enable_neutron:
@@ -379,6 +384,9 @@
 #kolla_enable_nova_ssh:
 #kolla_enable_octavia:
 #kolla_enable_octavia_driver_agent:
+#kolla_enable_opensearch:
+#kolla_enable_opensearch_dashboards:
+#kolla_enable_opensearch_dashboards_external:
 #kolla_enable_openstack_core:
 #kolla_enable_openvswitch:
 #kolla_enable_osprofiler:
@@ -388,6 +396,7 @@
 #kolla_enable_placement:
 #kolla_enable_prometheus:
 #kolla_enable_prometheus_alertmanager:
+#kolla_enable_prometheus_alertmanager_external:
 #kolla_enable_prometheus_blackbox_exporter:
 #kolla_enable_prometheus_cadvisor:
 #kolla_enable_prometheus_ceph_mgr_exporter:
@@ -397,19 +406,20 @@
 #kolla_enable_prometheus_haproxy_exporter:
 #kolla_enable_prometheus_libvirt_exporter:
 #kolla_enable_prometheus_memcached_exporter:
+#kolla_enable_prometheus_msteams:
 #kolla_enable_prometheus_mysqld_exporter:
 #kolla_enable_prometheus_node_exporter:
 #kolla_enable_prometheus_openstack_exporter:
+#kolla_enable_prometheus_openstack_exporter_external:
 #kolla_enable_prometheus_rabbitmq_exporter:
 #kolla_enable_prometheus_server:
-#kolla_enable_qdrouterd:
+#kolla_enable_proxysql:
 #kolla_enable_rabbitmq:
 #kolla_enable_redis:
 #kolla_enable_sahara:
 #kolla_enable_senlin:
 #kolla_enable_skydive:
 #kolla_enable_solum:
-#kolla_enable_storm:
 #kolla_enable_swift:
 #kolla_enable_swift_recon:
 #kolla_enable_swift_s3api:
@@ -421,7 +431,6 @@
 #kolla_enable_vitrage:
 #kolla_enable_vitrage_prometheus_datasource:
 #kolla_enable_watcher:
-#kolla_enable_zookeeper:
 #kolla_enable_zun:
 
 ###############################################################################

etc/kayobe/monasca.yml

@@ -1,18 +0,0 @@
----
-###############################################################################
-# Monasca configuration.
-
-# Monasca OpenStack Project name.
-# The default is "monasca_control_plane".
-#monasca_control_plane_project:
-
-# Monasca OpenStack Domain name. Default is "default".
-#monasca_control_plane_domain:
-
-# Monasca Grafana Server port. Must match kolla-ansible
-# var of the same name. Default is "3001".
-#monasca_grafana_server_port:
-
-###############################################################################
-# Dummy variable to allow Ansible to accept this file.
-workaround_ansible_issue_8743: yes

etc/kayobe/neutron.yml

@@ -47,6 +47,13 @@
 # secret: not currently supported
 #kolla_neutron_ml2_generic_switch_hosts:
 
+# List of Ansible hosts whose switch interfaces are to be configured as tagged
+# members of all networks managed by the genericswitch ML2 mechanism driver.
+# These hosts will be matched against the description fields in the
+# switch_interface_config variable for each switch to determine which
+# interfaces should be configured.
+#kolla_neutron_ml2_generic_switch_trunk_port_hosts:
+
 # Dict containing additional configuration for switches managed by the
 # genericswitch ML2 mechanism driver. For per-switch configuration of switches
 # in kolla_neutron_ml2_generic_switch_hosts, this may be set as a group or

etc/kayobe/openstack.yml

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

etc/kayobe/overcloud-dib.yml

@@ -7,9 +7,12 @@
 # Whether to build host disk images with DIB directly instead of through
 # Bifrost. Setting it to true disables Bifrost image build and allows images to
 # be built with the `kayobe overcloud host image build` command. Default value
-# is {{ os_distribution == 'rocky' }}. This will change in a future release.
+# is true.
 #overcloud_dib_build_host_images:
 
+# List of additional build host packages to install. Default is an empty list.
+#overcloud_dib_host_packages_extra:
+
 # List of overcloud host disk images to build. Each element is a dict defining
 # an image in a format accepted by the stackhpc.os-images role. Default is to
 # build an image named "deployment_image" configured with the overcloud_dib_*
@@ -76,6 +79,10 @@
 # pip_upper_constraints_file }}.
 #overcloud_dib_upper_constraints_file:
 
+# Upper constraints file for installation of DIB to build overcloud host
+# disk images. Default is empty string.
+#overcloud_dib_dib_upper_constraints_file:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/seed-vm.yml

@@ -14,6 +14,12 @@
 # List of volumes.
 #seed_vm_volumes:
 
+# Root volume.
+#seed_vm_root_volume:
+
+# Data volume.
+#seed_vm_data_volume:
+
 # Name of the storage pool for the seed VM volumes.
 #seed_vm_pool:
 
@@ -24,12 +30,12 @@
 #seed_vm_root_format:
 
 # Base image for the seed VM root volume. Default is
-# "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
+# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu",
-# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
+# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
 # otherwise.
 #seed_vm_root_image:
 

etc/kayobe/seed.yml

@@ -100,7 +100,6 @@ seed_bootstrap_user: "{{ lookup('env', 'USER') }}"
 # Example:
 # seed_containers:
 #   squid:
-#     name: "squid"
 #     image: "stackhpc/squid:3.5.20-1"
 #     pre: "{{ kayobe_env_config_path }}/containers/squid/pre.yml"
 #     post: "{{ kayobe_env_config_path }}/containers/squid/post.yml"

etc/kayobe/ssh.yml

@@ -2,6 +2,9 @@
 ###############################################################################
 # SSH configuration.
 
+# Type of SSH key. Default is "rsa".
+#ssh_key_type:
+
 # Name of SSH key.
 #ssh_key_name:
 

zuul.d/project.yaml

@@ -4,48 +4,36 @@
     check:
       jobs:
         - openstack-tox-pep8
-        - kayobe-overcloud-centos8s
-        - kayobe-overcloud-rocky8
+        - kayobe-overcloud-rocky9
+        - kayobe-overcloud-centos9s
         - kayobe-overcloud-ubuntu-jammy
-        - kayobe-overcloud-tls-centos8s
-        - kayobe-overcloud-host-configure-centos8s
-        - kayobe-overcloud-host-configure-rocky8
+        - kayobe-overcloud-tls-rocky9
+        - kayobe-overcloud-host-configure-rocky9
+        - kayobe-overcloud-host-configure-centos9s
         - kayobe-overcloud-host-configure-ubuntu-jammy
-        - kayobe-overcloud-upgrade-centos8s
         - kayobe-overcloud-upgrade-ubuntu-focal
-        - kayobe-seed-centos8s
-        - kayobe-seed-rocky8
+        - kayobe-seed-rocky9
         - kayobe-seed-ubuntu-jammy
-        - kayobe-seed-images-centos8s
-        - kayobe-seed-upgrade-centos8s
+        - kayobe-seed-images-rocky9
         - kayobe-seed-upgrade-ubuntu-focal
-        - kayobe-seed-vm-centos8s
-        - kayobe-seed-vm-rocky8
+        - kayobe-seed-vm-rocky9
         - kayobe-seed-vm-ubuntu-jammy
-        - kayobe-infra-vm-centos8s
-        - kayobe-infra-vm-rocky8
+        - kayobe-infra-vm-rocky9
         - kayobe-infra-vm-ubuntu-jammy
 
     gate:
       jobs:
         - openstack-tox-pep8
-        - kayobe-overcloud-centos8s
-        - kayobe-overcloud-rocky8
+        - kayobe-overcloud-rocky9
         - kayobe-overcloud-ubuntu-jammy
-        - kayobe-overcloud-tls-centos8s
-        - kayobe-overcloud-host-configure-centos8s
-        - kayobe-overcloud-host-configure-rocky8
+        - kayobe-overcloud-tls-rocky9
+        - kayobe-overcloud-host-configure-rocky9
         - kayobe-overcloud-host-configure-ubuntu-jammy
-        - kayobe-overcloud-upgrade-centos8s
         - kayobe-overcloud-upgrade-ubuntu-focal
-        - kayobe-seed-centos8s
-        - kayobe-seed-rocky8
+        - kayobe-seed-rocky9
         - kayobe-seed-ubuntu-jammy
-        - kayobe-seed-upgrade-centos8s
         - kayobe-seed-upgrade-ubuntu-focal
-        - kayobe-seed-vm-centos8s
-        - kayobe-seed-vm-rocky8
+        - kayobe-seed-vm-rocky9
         - kayobe-seed-vm-ubuntu-jammy
-        - kayobe-infra-vm-centos8s
-        - kayobe-infra-vm-rocky8
+        - kayobe-infra-vm-rocky9
         - kayobe-infra-vm-ubuntu-jammy