Merge upstream unmaintained/yoga into stackhpc/yoga

Author: markgoddard

.gitreview

@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/kayobe-config.git
-defaultbranch=stable/yoga
+defaultbranch=unmaintained/yoga

etc/kayobe/bifrost.yml

@@ -116,6 +116,9 @@
 # Ironic inspector deployment ramdisk location.
 #kolla_bifrost_inspector_deploy_ramdisk:
 
+# Ironic inspector legacy deployment kernel location.
+#kolla_bifrost_inspector_legacy_deploy_kernel:
+
 # Timeout of hardware inspection on overcloud nodes, in seconds. Default is
 # {{ inspector_inspection_timeout }}.
 #kolla_bifrost_inspection_timeout:

etc/kayobe/compute.yml

@@ -63,15 +63,15 @@
 ###############################################################################
 # Compute node LVM configuration.
 
-# List of compute volume groups. See mrlesmithjr.manage-lvm role for
+# List of compute volume groups. See mrlesmithjr.manage_lvm role for
 # format.
 #compute_lvm_groups:
 
-# Default list of compute volume groups. See mrlesmithjr.manage-lvm role for
+# Default list of compute volume groups. See mrlesmithjr.manage_lvm role for
 # format.
 #compute_lvm_groups_default:
 
-# Additional list of compute volume groups. See mrlesmithjr.manage-lvm role
+# Additional list of compute volume groups. See mrlesmithjr.manage_lvm role
 # for format.
 #compute_lvm_groups_extra:
 
@@ -82,7 +82,7 @@
 # '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
+# Compute LVM volume group for data. See mrlesmithjr.manage_lvm role for
 # format.
 #compute_lvm_group_data:
 

etc/kayobe/controllers.yml

@@ -72,15 +72,15 @@
 ###############################################################################
 # Controller node LVM configuration.
 
-# List of controller volume groups. See mrlesmithjr.manage-lvm role for
+# List of controller volume groups. See mrlesmithjr.manage_lvm role for
 # format.
 #controller_lvm_groups:
 
-# Default list of controller volume groups. See mrlesmithjr.manage-lvm role for
+# Default list of controller volume groups. See mrlesmithjr.manage_lvm role for
 # format.
 #controller_lvm_groups_default:
 
-# Additional list of controller volume groups. See mrlesmithjr.manage-lvm role
+# Additional list of controller volume groups. See mrlesmithjr.manage_lvm role
 # for format.
 #controller_lvm_groups_extra:
 
@@ -91,7 +91,7 @@
 # '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
+# Controller LVM volume group for data. See mrlesmithjr.manage_lvm role for
 # format.
 #controller_lvm_group_data:
 

etc/kayobe/globals.yml

@@ -4,8 +4,7 @@
 ###############################################################################
 # Local path configuration (Ansible control host).
 
-# Path to Kayobe configuration directory on Ansible control host, with an
-# environment path appended if kayobe_environment is set.
+# Path to Kayobe configuration directory on Ansible control host.
 #kayobe_config_path:
 
 # Name of Kayobe environment to use. Default is $KAYOBE_ENVIRONMENT, or an
@@ -50,7 +49,7 @@
 #os_distribution:
 
 # OS release. Valid options are "8-stream" when os_distribution is "centos", or
-# "8" when os_distribution is "rocky", or "focal" and "jammy" when
+# "8" or "9" when os_distribution is "rocky", or "focal" and "jammy" when
 # os_distribution is "ubuntu".
 #os_release:
 

etc/kayobe/infra-vms.yml

@@ -34,10 +34,10 @@
 # when os_distribution is "ubuntu", or
 # https://dl.rockylinux.org/pub/rocky/8/images/x86_64/Rocky-8-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky" and os_release is "8"
-# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
-# when os_distribution is "rocky" and os_release is "9",
 # or
-# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.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" and os_release is "9"
+# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-latest.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
 
@@ -94,15 +94,15 @@
 ###############################################################################
 # Infrastructure VM node LVM configuration.
 
-# List of infrastructure vm volume groups. See mrlesmithjr.manage-lvm role for
+# List of infrastructure vm volume groups. See mrlesmithjr.manage_lvm role for
 # format.
 #infra_vm_lvm_groups:
 
-# Default list of infrastructure vm volume groups. See mrlesmithjr.manage-lvm
+# Default list of infrastructure vm volume groups. See mrlesmithjr.manage_lvm
 # role for format.
 #infra_vm_lvm_groups_default:
 
-# Additional list of infrastructure vm volume groups. See mrlesmithjr.manage-lvm
+# Additional list of infrastructure vm volume groups. See mrlesmithjr.manage_lvm
 # role for format.
 #infra_vm_lvm_groups_extra:
 
@@ -113,7 +113,7 @@
 # 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
 #infra_vm_lvm_group_data_enabled:
 
-# Infrastructure VM LVM volume group for data. See mrlesmithjr.manage-lvm role
+# Infrastructure VM LVM volume group for data. See mrlesmithjr.manage_lvm role
 # for format.
 #infra_vm_lvm_group_data:
 

etc/kayobe/kolla.yml

@@ -68,7 +68,8 @@ kolla_ansible_source_version: "{{ stackhpc_kolla_ansible_source_version }}"
 
 # Kolla base container image distribution. Options are "centos", "debian",
 # "rocky", "ubuntu". Default is
-# {{ 'centos' if (os_distribution == 'rocky' and os_release == '8') else os_distribution }}.
+# {{ 'centos' if (os_distribution == 'rocky' and os_release == '8') else
+# os_distribution }}.
 #kolla_base_distro:
 
 # Kolla container image type: binary or source. Default is 'source'.
@@ -666,6 +667,7 @@ kolla_enable_elasticsearch_curator: true
 #kolla_enable_gnocchi:
 #kolla_enable_gnocchi_statsd:
 kolla_enable_grafana: true
+#kolla_enable_grafana_external:
 #kolla_enable_hacluster:
 #kolla_enable_haproxy:
 #kolla_enable_haproxy_memcached:
@@ -705,6 +707,7 @@ kolla_enable_grafana: true
 #kolla_enable_keystone_federation:
 #kolla_enable_keystone_horizon_policy_file:
 #kolla_enable_kibana:
+#kolla_enable_kibana_external:
 #kolla_enable_kuryr:
 #kolla_enable_loadbalancer:
 #kolla_enable_magnum:
@@ -717,6 +720,8 @@ kolla_enable_grafana: true
 kolla_enable_mariabackup: True
 #kolla_enable_mariadb:
 #kolla_enable_masakari:
+#kolla_enable_masakari_hostmonitor:
+#kolla_enable_masakari_instancemonitor:
 #kolla_enable_memcached:
 #kolla_enable_mistral:
 #kolla_enable_monasca:
@@ -747,6 +752,9 @@ kolla_enable_mariabackup: True
 #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:
@@ -756,6 +764,7 @@ kolla_enable_mariabackup: True
 #kolla_enable_placement:
 kolla_enable_prometheus: true
 #kolla_enable_prometheus_alertmanager:
+#kolla_enable_prometheus_alertmanager_external:
 #kolla_enable_prometheus_blackbox_exporter:
 #kolla_enable_prometheus_cadvisor:
 #kolla_enable_prometheus_ceph_mgr_exporter:
@@ -765,6 +774,7 @@ kolla_enable_prometheus: true
 #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:
@@ -798,6 +808,10 @@ kolla_enable_prometheus: true
 # Kolla passwords file.
 #kolla_ansible_default_custom_passwords:
 
+# Dictionary containing extra custom passwords to add or override in the Kolla
+# passwords file.
+#kolla_ansible_extra_custom_passwords:
+
 # Dictionary containing custom passwords to add or override in the Kolla
 # passwords file.
 #kolla_ansible_custom_passwords:
@@ -837,7 +851,7 @@ kolla_enable_prometheus: true
 # Path to a CA certificate file to use for the OS_CACERT environment variable
 # in public-openrc.sh file when TLS is enabled, instead of Kolla-Ansible's
 # default.
-#kolla_external_fqdn_cacert:
+#kolla_public_openrc_cacert:
 
 # Internal API certificate bundle.
 #
@@ -850,7 +864,7 @@ kolla_enable_prometheus: true
 # Path to a CA certificate file to use for the OS_CACERT environment variable
 # in admin-openrc.sh file when TLS is enabled, instead of Kolla-Ansible's
 # default.
-#kolla_internal_fqdn_cacert:
+#kolla_admin_openrc_cacert:
 
 ###############################################################################
 # Proxy configuration

etc/kayobe/monitoring.yml

@@ -63,15 +63,15 @@
 ###############################################################################
 # Monitoring node LVM configuration.
 
-# List of monitoring node volume groups. See mrlesmithjr.manage-lvm role for
+# List of monitoring node volume groups. See mrlesmithjr.manage_lvm role for
 # format.
 #monitoring_lvm_groups:
 
-# Default list of monitoring node volume groups. See mrlesmithjr.manage-lvm
+# Default list of monitoring node volume groups. See mrlesmithjr.manage_lvm
 # role for format.
 #monitoring_lvm_groups_default:
 
-# Additional list of monitoring node volume groups. See mrlesmithjr.manage-lvm
+# Additional list of monitoring node volume groups. See mrlesmithjr.manage_lvm
 # role for format.
 #monitoring_lvm_groups_extra:
 

etc/kayobe/seed-hypervisor.yml

@@ -36,7 +36,7 @@
 ###############################################################################
 # Seed hypervisor node LVM configuration.
 
-# List of seed hypervisor volume groups. See mrlesmithjr.manage-lvm role for
+# 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:
@@ -45,7 +45,7 @@
 # default.
 #seed_hypervisor_lvm_groups_with_data:
 
-# Seed LVM volume group for data. See mrlesmithjr.manage-lvm role for format.
+# 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

etc/kayobe/seed-vm.yml

@@ -25,13 +25,13 @@
 
 # Base image for the seed VM root volume. Default is
 # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
-# when os_distribution is "ubuntu",
+# when os_distribution is "ubuntu", or
 # https://dl.rockylinux.org/pub/rocky/8/images/x86_64/Rocky-8-GenericCloud.latest.x86_64.qcow2
-# when os_distribution is "rocky" and os_release is "8",
-# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
-# when os_distribution is "rocky" and os_release is "9",
+# when os_distribution is "rocky" and os_release is "8"
 # or
-# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.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" and os_release is "9"
+# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-latest.x86_64.qcow2"
 # otherwise.
 #seed_vm_root_image: