From 9087b242b8e6a0eed1bc0c9528b781c113caabe4 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Mon, 4 Nov 2024 20:15:33 +0100 Subject: [PATCH] [release] Synchronise with kayobe for 2024.2 Change-Id: Id420053d2489145795f56436a8247989fd406448 --- etc/kayobe/apt.yml | 12 +++++++++--- etc/kayobe/bifrost.yml | 6 ++++++ etc/kayobe/bmc.yml | 3 +++ etc/kayobe/globals.yml | 2 +- etc/kayobe/infra-vms.yml | 8 +++++++- etc/kayobe/kolla.yml | 8 ++++++-- etc/kayobe/openstack.yml | 4 ++-- etc/kayobe/overcloud-dib.yml | 2 +- etc/kayobe/seed-vm.yml | 8 +++++++- 9 files changed, 42 insertions(+), 11 deletions(-) diff --git a/etc/kayobe/apt.yml b/etc/kayobe/apt.yml index e4bb5b1..9302675 100644 --- a/etc/kayobe/apt.yml +++ b/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. jammy (optional, default +# * suites: whitespace-separated list of suites, e.g. noble (optional, default # is ansible_facts.distribution_release) # * components: whitespace-separated list of components, e.g. main (optional, # default is 'main') @@ -41,6 +41,14 @@ # Default is an empty list. #apt_repositories: +# List of Apt preferences options. Each item is a dict with the following +# keys: +# * content: free-form preferences file content +# * filename: name of a file in /etc/apt/preferences.d/ in which to write +# the configuration +# Default is an empty list. +#apt_preferences: + # Whether to disable repositories in /etc/apt/sources.list. This may be used # when replacing the distribution repositories via apt_repositories. # Default is false. @@ -50,8 +58,6 @@ # * machine: 'machine' entry in the auth file # * login: 'login' entry in the auth file # * password: 'password' entry in the auth file -# * filename: Name of a file in which to store the auth configuration. The -# extension should be '.conf'. # * filename: Name of a file in /etc/apt/auth.conf.d in which to store # the auth configuration. The extension should be ``.conf``. # Default is an empty list. diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml index 123c53d..741bbd8 100644 --- a/etc/kayobe/bifrost.yml +++ b/etc/kayobe/bifrost.yml @@ -158,6 +158,12 @@ # Server inventory for Bifrost. #kolla_bifrost_servers: +############################################################################### +# Node provisioning configuration +# Whether to use Ironic introspection data for admin interface MAC address +# Default is false. +#kolla_bifrost_use_introspection_mac: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes diff --git a/etc/kayobe/bmc.yml b/etc/kayobe/bmc.yml index ea10df3..b29ecf6 100644 --- a/etc/kayobe/bmc.yml +++ b/etc/kayobe/bmc.yml @@ -14,6 +14,9 @@ # Password to use to access a host's BMC via IPMI. #ipmi_password: +# Address to use to access a host's BMC via Redfish. +#redfish_address: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes diff --git a/etc/kayobe/globals.yml b/etc/kayobe/globals.yml index 3e127af..d8d50e7 100644 --- a/etc/kayobe/globals.yml +++ b/etc/kayobe/globals.yml @@ -49,7 +49,7 @@ os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}" # 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 +# "9" when os_distribution is "rocky", or "noble" when os_distribution is # "ubuntu". #os_release: diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml index a8f1fd9..cbfa34e 100644 --- a/etc/kayobe/infra-vms.yml +++ b/etc/kayobe/infra-vms.yml @@ -30,7 +30,7 @@ #infra_vm_root_format: # Base image for the infra VM root volume. Default is -# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img" +# "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img" # when os_distribution is "ubuntu", or # https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2 # when os_distribution is "rocky", @@ -58,6 +58,12 @@ # OS family. Needed for config drive generation. #infra_vm_os_family: +# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'efi'. +#infra_vm_boot_firmware: + +# Machine type. Libvirt default configuration is used. +#infra_vm_machine: + ############################################################################### # Infrastructure VM node configuration. diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index eb08633..9a53b1c 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -66,6 +66,10 @@ ############################################################################### # Kolla configuration. +# Kolla base container image architecture. Options are "x86_64", "aarch64". +# Default is "{{ ansible_facts.architecture }}" +#kolla_base_arch: + # Kolla base container image distribution. Options are "centos", "debian", # "rocky", "ubuntu". Default is {{ os_distribution }}. #kolla_base_distro: @@ -286,12 +290,12 @@ #kolla_enable_ceph_rgw: #kolla_enable_ceph_rgw_loadbalancer: #kolla_enable_cinder: -#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_pure_fc: #kolla_enable_cinder_backend_pure_iscsi: +#kolla_enable_cinder_backend_pure_nvme_tcp: #kolla_enable_cinder_backend_pure_roce: #kolla_enable_cinder_backend_quobyte: #kolla_enable_cinder_backup: @@ -412,11 +416,11 @@ #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_proxysql_exporter: #kolla_enable_prometheus_rabbitmq_exporter: #kolla_enable_prometheus_server: #kolla_enable_proxysql: diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml index 4db759f..fad8d08 100644 --- a/etc/kayobe/openstack.yml +++ b/etc/kayobe/openstack.yml @@ -2,10 +2,10 @@ ############################################################################### # OpenStack release configuration. -# Name of the current OpenStack release. Default is "2024.1". +# Name of the current OpenStack release. Default is "2024.2". #openstack_release: -# Name of the current OpenStack branch. Default is "stable/2024.1". +# Name of the current OpenStack branch. Default is "stable/2024.2". #openstack_branch: ############################################################################### diff --git a/etc/kayobe/overcloud-dib.yml b/etc/kayobe/overcloud-dib.yml index f5f9352..e3066fd 100644 --- a/etc/kayobe/overcloud-dib.yml +++ b/etc/kayobe/overcloud-dib.yml @@ -30,7 +30,7 @@ #overcloud_dib_os_release: # List of default DIB elements. Default is ["{{ overcloud_dib_os_element }}", -# "cloud-init-datasources", "enable-serial-console", "vm"]. +# "cloud-init", "cloud-init-datasources", "enable-serial-console", "vm"]. #overcloud_dib_elements_default: # List of additional DIB elements. Default is none. diff --git a/etc/kayobe/seed-vm.yml b/etc/kayobe/seed-vm.yml index f10fbaa..aa805d8 100644 --- a/etc/kayobe/seed-vm.yml +++ b/etc/kayobe/seed-vm.yml @@ -30,7 +30,7 @@ #seed_vm_root_format: # Base image for the seed VM root volume. Default is -# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img" +# "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img" # when os_distribution is "ubuntu", # https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2 # when os_distribution is "rocky", @@ -61,6 +61,12 @@ # #seed_vm_interfaces: +# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'efi'. +#seed_vm_boot_firmware: + +# Machine type. Libvirt default configuration is used. +#seed_vm_machine: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes