From 3adf46cfd1137aae68c729c33b53b8c691f03ca3 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 1 Jun 2023 09:15:12 +0100 Subject: [PATCH 1/8] 2023.1 - Sync defaults with Kayobe skydive != skyline Change-Id: If57a9d39a77ca02a1cd7f59ae5691fbf39b78964 --- etc/kayobe/kolla.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 2d9a1e696..81e48c55b 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -432,7 +432,7 @@ #kolla_enable_redis: #kolla_enable_sahara: #kolla_enable_senlin: -#kolla_enable_skydive: +#kolla_enable_skyline: #kolla_enable_solum: #kolla_enable_swift: #kolla_enable_swift_recon: From 651b8be1a0a2dd38ab46253a0c4a9c7d617cf7bc Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 20 Sep 2023 09:14:17 +0100 Subject: [PATCH 2/8] kayobe-env: Unstick KOLLA_SOURCE_PATH and KOLLA_VENV_PATH The kayobe-env script does not update the KOLLA_SOURCE_PATH and KOLLA_VENV_PATH variables if they are already set. This can lead to dangerous and difficult to diagnose issues where Kayobe uses a different version of Kolla Ansible than expected. This change updates these variables each time the kayobe-env script is sourced. Change-Id: I3b4b0b611750b9c7846ff5f74554aee2f14939e4 Closes-Bug: #2036711 --- kayobe-env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kayobe-env b/kayobe-env index 5137927e5..28b1cccdb 100644 --- a/kayobe-env +++ b/kayobe-env @@ -30,8 +30,8 @@ export KOLLA_CONFIG_PATH=$KAYOBE_CONFIG_ROOT/etc/kolla # kayobe/ # kolla-ansible/ base_path=$(realpath $KAYOBE_CONFIG_ROOT/../../) -export KOLLA_SOURCE_PATH=${KOLLA_SOURCE_PATH:-${base_path}/src/kolla-ansible} -export KOLLA_VENV_PATH=${KOLLA_VENV_PATH:-${base_path}/venvs/kolla-ansible} +export KOLLA_SOURCE_PATH=${base_path}/src/kolla-ansible +export KOLLA_VENV_PATH=${base_path}/venvs/kolla-ansible function check_and_export_env { # Look for existing Kayobe environments From 04a6f86b2589269d182c54949566ad3245376d91 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 1 Dec 2023 16:02:55 +0100 Subject: [PATCH 3/8] [release] Synchronise with kayobe for 2023.2 Change-Id: Id34971a3ad2c1704a132f7cf5ca996dd3493906d --- etc/kayobe/bifrost.yml | 11 +++-- etc/kayobe/compute.yml | 8 +-- etc/kayobe/controllers.yml | 27 +++++++++-- etc/kayobe/docker.yml | 5 ++ etc/kayobe/grafana.yml | 3 +- etc/kayobe/infra-vms.yml | 8 +-- etc/kayobe/inventory/groups | 15 +++++- etc/kayobe/ipa.yml | 3 +- etc/kayobe/kolla.yml | 89 +++++++++++++++++++++++++++++++--- etc/kayobe/monitoring.yml | 6 +-- etc/kayobe/openstack.yml | 4 +- etc/kayobe/overcloud-dib.yml | 9 +--- etc/kayobe/seed-hypervisor.yml | 4 +- etc/kayobe/seed.yml | 12 +++-- etc/kayobe/storage.yml | 8 +-- etc/kayobe/vgpu.yml | 22 +++++++++ 16 files changed, 185 insertions(+), 49 deletions(-) create mode 100644 etc/kayobe/vgpu.yml diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml index a9eba19dd..18511afbf 100644 --- a/etc/kayobe/bifrost.yml +++ b/etc/kayobe/bifrost.yml @@ -28,9 +28,7 @@ # DIB image OS release. Default is {{ os_release }}. #kolla_bifrost_dib_os_release: -# List of default DIB elements. Default is ["disable-selinux", -# "enable-serial-console", "vm"] when os_distribution is "centos", or -# ["enable-serial-console", "vm"] otherwise. +# List of default DIB elements. Default is ["enable-serial-console", "vm"]. #kolla_bifrost_dib_elements_default: # List of additional DIB elements. Default is none. @@ -71,6 +69,10 @@ # Default is none. #kolla_bifrost_deploy_image_rootfs: +# Custom cloud-init user-data passed to deploy of the deployment image. +# Default is an empty string. +#kolla_bifrost_deploy_image_user_data_content: + ############################################################################### # Ironic configuration. @@ -116,6 +118,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: diff --git a/etc/kayobe/compute.yml b/etc/kayobe/compute.yml index 03c41e3db..15c4cbcc6 100644 --- a/etc/kayobe/compute.yml +++ b/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: diff --git a/etc/kayobe/controllers.yml b/etc/kayobe/controllers.yml index 983251c6c..76b7bb00a 100644 --- a/etc/kayobe/controllers.yml +++ b/etc/kayobe/controllers.yml @@ -6,6 +6,25 @@ # to setup the Kayobe user account. Default is {{ os_distribution }}. #controller_bootstrap_user: +############################################################################### +# Controller groups. + +# Ansible inventory group in which Ironic conductor services are deployed. +# Default is 'controllers'. +#controller_ironic_conductor_group: + +# Ansible inventory group in which Ironic inspector services are deployed. +# Default is 'controllers'. +#controller_ironic_inspector_group: + +# Ansible inventory group in which control plane load balancer services are +# deployed. Default is 'network'. +#controller_loadbalancer_group: + +# Ansible inventory group in which network data plane services are deployed. +# Default is 'network'. +#controller_network_group: + ############################################################################### # Controller network interface configuration. @@ -72,15 +91,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 +110,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: diff --git a/etc/kayobe/docker.yml b/etc/kayobe/docker.yml index 4ec00a1f4..ba3f22c9a 100644 --- a/etc/kayobe/docker.yml +++ b/etc/kayobe/docker.yml @@ -24,6 +24,11 @@ # URL of docker registry #docker_registry: +# Whether docker should be configured to use an insecure registry. +# Default is false, unless docker_registry_enabled is true and +# docker_registry_enable_tls is false. +#docker_registry_insecure: + # CA of docker registry #docker_registry_ca: diff --git a/etc/kayobe/grafana.yml b/etc/kayobe/grafana.yml index d67a972e3..66d19c7a3 100644 --- a/etc/kayobe/grafana.yml +++ b/etc/kayobe/grafana.yml @@ -2,8 +2,7 @@ ############################################################################### # Grafana configuration. -# Grafana local admin user name. If you are deploying Monasca Grafana this -# should not conflict with an OpenStack user name. +# Grafana local admin user name. #grafana_local_admin_user_name: ############################################################################### diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml index c8050d050..3e1db5d5e 100644 --- a/etc/kayobe/infra-vms.yml +++ b/etc/kayobe/infra-vms.yml @@ -92,15 +92,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: @@ -111,7 +111,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: diff --git a/etc/kayobe/inventory/groups b/etc/kayobe/inventory/groups index 16619fed8..645a550b5 100644 --- a/etc/kayobe/inventory/groups +++ b/etc/kayobe/inventory/groups @@ -41,8 +41,11 @@ controllers [storage] # Empty group to provide declaration of storage group. -[compute] -# Empty group to provide declaration of compute group. +[compute-vgpu] +# Empty group to provide declaration of compute-vgpu group. + +[compute:children] +compute-vgpu [overcloud:children] controllers @@ -51,6 +54,14 @@ monitoring storage compute +############################################################################### +# Feature control groups +[vgpu:children] +compute-vgpu + +[iommu:children] +vgpu + ############################################################################### # Service groups. diff --git a/etc/kayobe/ipa.yml b/etc/kayobe/ipa.yml index 5877d039a..b3df6dd44 100644 --- a/etc/kayobe/ipa.yml +++ b/etc/kayobe/ipa.yml @@ -24,7 +24,8 @@ # List of default Diskimage Builder (DIB) elements to use when building IPA # images. Default is ["centos", "enable-serial-console", -# "ironic-python-agent-ramdisk"]. +# "ironic-python-agent-ramdisk"] when os_distribution is "rocky", and +# ["ubuntu", "enable-serial-console", "ironic-python-agent-ramdisk"] otherwise. #ipa_build_dib_elements_default: # List of additional Diskimage Builder (DIB) elements to use when building IPA diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 81e48c55b..c604747a8 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -85,11 +85,6 @@ # Docker namespace to use for Kolla images. Default is 'kolla'. #kolla_docker_namespace: -# Whether docker should be configured to use an insecure registry for Kolla -# images. Default is false, unless docker_registry_enabled is true and -# docker_registry_enable_tls is false. -#kolla_docker_registry_insecure: - # Username to use to access a docker registry. Default is not set, in which # case the registry will be used without authentication. #kolla_docker_registry_username: @@ -349,6 +344,7 @@ #kolla_enable_influxdb: #kolla_enable_ironic: #kolla_enable_ironic_neutron_agent: +#kolla_enable_ironic_prometheus_exporter: #kolla_enable_ironic_pxe_uefi: #kolla_enable_iscsid: #kolla_enable_keepalived: @@ -356,6 +352,7 @@ #kolla_enable_keystone_federation: #kolla_enable_keystone_horizon_policy_file: #kolla_enable_kuryr: +#kolla_enable_letsencrypt: #kolla_enable_loadbalancer: #kolla_enable_magnum: #kolla_enable_manila: @@ -398,6 +395,7 @@ #kolla_enable_nova_ssh: #kolla_enable_octavia: #kolla_enable_octavia_driver_agent: +#kolla_enable_octavia_jobboard: #kolla_enable_opensearch: #kolla_enable_opensearch_dashboards: #kolla_enable_opensearch_dashboards_external: @@ -447,6 +445,79 @@ #kolla_enable_watcher: #kolla_enable_zun: +############################################################################### +# Kolla custom config generation. + +# Feature flag to add $KAYOBE_CONFIG_PATH to the list of search paths used +# when searching for Kolla custom service configuration. Only has an effect in +# a multiple environments setup. This allows you to configure merging between +# your environment and the base layer. Defaults to true. Set to false to for +# backwards compatability. +#kolla_openstack_custom_config_environment_merging_enabled: + +# Default value for kolla_openstack_custom_config_include_globs. +#kolla_openstack_custom_config_include_globs_default: + +# Extra items to add to kolla_openstack_custom_config_include_globs_default +# to produce kolla_openstack_custom_config_include_globs. +#kolla_openstack_custom_config_include_globs_extra: + +# List of dictionaries with the following keys: +# glob: a glob pattern. Any files matching this pattern will be copied to the +# the kolla custom config directory +# enabled: boolean to disable the glob. +# This determines the list of files to copy to the generated kolla config +# directory. +#kolla_openstack_custom_config_include_globs: + +# Kolla config generation rules. These operate on the list of files produced by +# applying kolla_openstack_custom_config_include_globs. Each of the paths in +# kolla_openstack_custom_config_paths is searched for files matching one of the +# globs. If a match is found, any files with the same relative path are grouped +# together. The rules determine what to do with these matching files e.g copy +# the most specific file without templating, merge the files with +# merge_configs, etc. +# List of dictionaries with the following keys: +# glob: A glob matching files for this rule to match on (relative to the +# search path) +# priority: The rules are processed in increasing priority order with the +# first rule matching taking effect. +# strategy: How to process the matched file. One of copy, concat, template, +# merge_configs, merge_yaml +# params: List of params to pass to module enacting the strategy +# Strategies: +# copy: Copy most specific file to kolla config without templating +# template: Template most specific file to kolla config +# concat: Concatenate files and copy the result to generated kolla config +# merge_configs: Use the merge_configs module to merge an ini file, before +# copying to the generated kolla-config. +# merge_yaml: Use the merge_yaml module to merge a file, before copying to +# the generated kolla-config. +#kolla_openstack_custom_config_rules: + +# Whether to enable ini merging rules in +# kolla_openstack_custom_config_rules_default. Default is true. +#kolla_openstack_custom_config_merge_configs_enabled: + +# Whether to enable yaml merging rules in +# kolla_openstack_custom_config_rules_default. Default is true. +#kolla_openstack_custom_config_merge_yaml_enabled: + +# Default merge strategy for ini files in +# kolla_openstack_custom_config_rules_default. Default is concat. +#kolla_openstack_custom_config_ini_merge_strategy_default: + +# Default value for kolla_openstack_custom_config_rules. +#kolla_openstack_custom_config_rules_default: + +# List of globs to filter from kolla_openstack_custom_config_rules_default. +# Default is an empty list. +#kolla_openstack_custom_config_rules_default_remove: + +# Extra items to add to kolla_openstack_custom_config_rules_default +# to produce kolla_openstack_custom_config_rules. +#kolla_openstack_custom_config_rules_extra: + ############################################################################### # Passwords and credentials. @@ -454,6 +525,10 @@ # 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: @@ -493,7 +568,7 @@ # 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. # @@ -506,7 +581,7 @@ # 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 diff --git a/etc/kayobe/monitoring.yml b/etc/kayobe/monitoring.yml index f332ab938..5468936d3 100644 --- a/etc/kayobe/monitoring.yml +++ b/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: diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml index f5c25faac..cb19104f7 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 "2023.1". +# Name of the current OpenStack release. Default is "2023.2". #openstack_release: -# Name of the current OpenStack branch. Default is "stable/2023.1". +# Name of the current OpenStack branch. Default is "stable/2023.2". #openstack_branch: ############################################################################### diff --git a/etc/kayobe/overcloud-dib.yml b/etc/kayobe/overcloud-dib.yml index 0efa25f40..abdb4ee20 100644 --- a/etc/kayobe/overcloud-dib.yml +++ b/etc/kayobe/overcloud-dib.yml @@ -28,13 +28,8 @@ # DIB image OS release. Default is {{ os_release }}. #overcloud_dib_os_release: -# List of default DIB elements. Default is ["centos", "cloud-init-datasources", -# "disable-selinux", "enable-serial-console", "vm"] when -# overcloud_dib_os_element is "centos", or ["rocky-container", -# "cloud-init-datasources", "disable-selinux", "enable-serial-console", "vm"] -# when overcloud_dib_os_element is "rocky" or -# ["ubuntu", "cloud-init-datasources", "enable-serial-console", "vm"] -# when overcloud_dib_os_element is "ubuntu". +# List of default DIB elements. Default is ["{{ overcloud_dib_os_element }}", +# "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-hypervisor.yml b/etc/kayobe/seed-hypervisor.yml index ac72fcd3d..dd8fbca23 100644 --- a/etc/kayobe/seed-hypervisor.yml +++ b/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 diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml index ade99307d..bc86fa627 100644 --- a/etc/kayobe/seed.yml +++ b/etc/kayobe/seed.yml @@ -36,14 +36,14 @@ ############################################################################### # 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 +# 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 +# Additional list of seed volume groups. See mrlesmithjr.manage_lvm role for # format. #seed_lvm_groups_extra: @@ -54,7 +54,7 @@ # '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 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. Default to an invalid @@ -106,6 +106,10 @@ # #seed_containers: +# Whether to attempt a basic authentication login to a registry when +# deploying seed containers +#seed_deploy_containers_registry_attempt_login: + ############################################################################### # Seed node firewalld configuration. diff --git a/etc/kayobe/storage.yml b/etc/kayobe/storage.yml index 535666c95..e9e52dfe6 100644 --- a/etc/kayobe/storage.yml +++ b/etc/kayobe/storage.yml @@ -68,15 +68,15 @@ ############################################################################### # Storage node LVM configuration. -# List of storage volume groups. See mrlesmithjr.manage-lvm role for +# List of storage volume groups. See mrlesmithjr.manage_lvm role for # format. #storage_lvm_groups: -# Default list of storage volume groups. See mrlesmithjr.manage-lvm role for +# Default list of storage volume groups. See mrlesmithjr.manage_lvm role for # format. #storage_lvm_groups_default: -# Additional list of storage volume groups. See mrlesmithjr.manage-lvm role +# Additional list of storage volume groups. See mrlesmithjr.manage_lvm role # for format. #storage_lvm_groups_extra: @@ -87,7 +87,7 @@ # '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 +# Storage LVM volume group for data. See mrlesmithjr.manage_lvm role for # format. #storage_lvm_group_data: diff --git a/etc/kayobe/vgpu.yml b/etc/kayobe/vgpu.yml new file mode 100644 index 000000000..c304f123c --- /dev/null +++ b/etc/kayobe/vgpu.yml @@ -0,0 +1,22 @@ +--- +################################################################################ +# VGPU configuration. + +# URL pointing to location of GRID driver. Examples are: +# "file://path/on/ansible/control/host" +# "http://webserver/NVIDIA-GRID-Linux-KVM-525.105.14-525.105.17-528.89.zip" +# Default is: None. +#vgpu_driver_url: + +# Flag to control whether the vGPU playbook should automatically reboot the +# hypervisor. Note: this is necessary for the driver to be loaded correctly. +# Caution should be used when changing this option. Default is true. +#vgpu_do_reboot: + +# Time to wait when rebooting the host before failing. +# Default is 600 (seconds). +#vgpu_reboot_timeout: + +############################################################################### +# Dummy variable to allow Ansible to accept this file. +workaround_ansible_issue_8743: yes From 23253cf0cfff62693018bdd6a509affd6a469f85 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 30 May 2024 09:24:09 +0200 Subject: [PATCH 4/8] [release] Synchronise with kayobe for 2024.1 Change-Id: I58d25ddc14d742d9ed79db4d5cd2d20a3e2b791a --- etc/kayobe/apt.yml | 11 +++++++++++ etc/kayobe/bifrost.yml | 6 ++++++ etc/kayobe/compute.yml | 8 +++----- etc/kayobe/controllers.yml | 5 ++--- etc/kayobe/infra-vms.yml | 4 +--- etc/kayobe/inspector.yml | 18 ++++++++++++++++++ etc/kayobe/ipa.yml | 7 ++++--- etc/kayobe/kolla.yml | 19 ++++--------------- etc/kayobe/networks.yml | 2 +- etc/kayobe/openstack.yml | 4 ++-- etc/kayobe/overcloud-dib.yml | 13 +++++++------ etc/kayobe/seed.yml | 6 ++---- etc/kayobe/storage.yml | 6 ++---- 13 files changed, 63 insertions(+), 46 deletions(-) diff --git a/etc/kayobe/apt.yml b/etc/kayobe/apt.yml index 9a9d88538..e4bb5b179 100644 --- a/etc/kayobe/apt.yml +++ b/etc/kayobe/apt.yml @@ -46,6 +46,17 @@ # Default is false. #apt_disable_sources_list: +# List of Apt auth configurations. Each item is a dict with the following keys: +# * 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. +#apt_auth: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml index 18511afbf..123c53d23 100644 --- a/etc/kayobe/bifrost.yml +++ b/etc/kayobe/bifrost.yml @@ -108,6 +108,12 @@ # Ironic inspector IPMI password to set. #kolla_bifrost_inspector_ipmi_password: +# Ironic inspector Redfish username to set. +#kolla_bifrost_inspector_redfish_username: + +# Ironic inspector Redfish password to set. +#kolla_bifrost_inspector_redfish_password: + # Ironic inspector network interface name on which to check for an LLDP switch # port description to use as the node's name. #kolla_bifrost_inspector_lldp_switch_port_interface: diff --git a/etc/kayobe/compute.yml b/etc/kayobe/compute.yml index 15c4cbcc6..c1ebf4bbc 100644 --- a/etc/kayobe/compute.yml +++ b/etc/kayobe/compute.yml @@ -76,10 +76,8 @@ #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. +# this contains a 'docker-volumes' logical volume for Docker volume storage. +# Default is false. #compute_lvm_group_data_enabled: # Compute LVM volume group for data. See mrlesmithjr.manage_lvm role for @@ -180,7 +178,7 @@ #compute_qemu_conf: # Whether to enable libvirt SASL authentication. Default is true. -#compute_libvirt_enable_sasl: true +#compute_libvirt_enable_sasl: # libvirt SASL password. Default is unset. #compute_libvirt_sasl_password: diff --git a/etc/kayobe/controllers.yml b/etc/kayobe/controllers.yml index 76b7bb00a..d974cc6b1 100644 --- a/etc/kayobe/controllers.yml +++ b/etc/kayobe/controllers.yml @@ -105,9 +105,8 @@ # 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. +# storage. +# Default is false. #controller_lvm_group_data_enabled: # Controller LVM volume group for data. See mrlesmithjr.manage_lvm role for diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml index 3e1db5d5e..a8f1fd9b2 100644 --- a/etc/kayobe/infra-vms.yml +++ b/etc/kayobe/infra-vms.yml @@ -106,9 +106,7 @@ # Whether a 'data' LVM volume group should exist on the infrastructure vm. 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. Default is false. #infra_vm_lvm_group_data_enabled: # Infrastructure VM LVM volume group for data. See mrlesmithjr.manage_lvm role diff --git a/etc/kayobe/inspector.yml b/etc/kayobe/inspector.yml index 90c5d8750..123481a5f 100644 --- a/etc/kayobe/inspector.yml +++ b/etc/kayobe/inspector.yml @@ -58,6 +58,9 @@ ############################################################################### # Ironic inspector configuration. +# Ironic inspector option to enable IPMI rules. Set to 'True' by default. +#inspector_rules_ipmi_enabled: + # Ironic inspector IPMI username to set. #inspector_ipmi_username: @@ -72,6 +75,21 @@ # check for an LLDP switch port description to use as the node's name. #inspector_lldp_switch_port_interface_map: +# Ironic inspector uses IPMI by default enroll the baremetal nodes, however it +# is possible to use Redfish instead. To do that enable Redfish and make sure +# all of the necessary variables below have been properly set. +# Enable inspector Redfish rules. Set to 'False' by default. +#inspector_rules_redfish_enabled: + +# Ironic inspector Redfish username to set. +#inspector_redfish_username: + +# Ironic inspector Redfish password to set. +#inspector_redfish_password: + +# Redfish CA setting. Set to 'True' by default +#inspector_rule_var_redfish_verify_ca: + ############################################################################### # Ironic inspector introspection rules configuration. diff --git a/etc/kayobe/ipa.yml b/etc/kayobe/ipa.yml index b3df6dd44..0138c6c44 100644 --- a/etc/kayobe/ipa.yml +++ b/etc/kayobe/ipa.yml @@ -50,15 +50,16 @@ #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. +# See stackhpc.openstack.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. +# elements. See stackhpc.openstack.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. Default is a combination of +# stackhpc.openstack.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: diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index c604747a8..c75ca9c22 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -306,7 +306,7 @@ #kolla_enable_external_api_firewalld: #kolla_enable_external_mariadb_load_balancer: #kolla_enable_fluentd: -#kolla_enable_freezer: +#kolla_enable_fluentd_systemd: #kolla_enable_glance: #kolla_enable_glance_horizon_policy_file: #kolla_enable_glance_image_cache: @@ -323,29 +323,23 @@ #kolla_enable_horizon_blazar: #kolla_enable_horizon_cloudkitty: #kolla_enable_horizon_designate: -#kolla_enable_horizon_freezer: +#kolla_enable_horizon_fwaas: #kolla_enable_horizon_heat: #kolla_enable_horizon_ironic: #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_sahara: -#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_influxdb: #kolla_enable_ironic: #kolla_enable_ironic_neutron_agent: #kolla_enable_ironic_prometheus_exporter: -#kolla_enable_ironic_pxe_uefi: #kolla_enable_iscsid: #kolla_enable_keepalived: #kolla_enable_keystone: @@ -369,11 +363,11 @@ #kolla_enable_memcached: #kolla_enable_mistral: #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_horizon_policy_file: #kolla_enable_neutron_infoblox_ipam_agent: #kolla_enable_neutron_metering: @@ -385,6 +379,7 @@ #kolla_enable_neutron_segments: #kolla_enable_neutron_sfc: #kolla_enable_neutron_sriov: +#kolla_enable_neutron_taas: #kolla_enable_neutron_trunk: #kolla_enable_neutron_vpnaas: #kolla_enable_nova: @@ -402,7 +397,6 @@ #kolla_enable_openstack_core: #kolla_enable_openvswitch: #kolla_enable_osprofiler: -#kolla_enable_outward_rabbitmq: #kolla_enable_ovn: #kolla_enable_ovs_dpdk: #kolla_enable_placement: @@ -428,10 +422,7 @@ #kolla_enable_proxysql: #kolla_enable_rabbitmq: #kolla_enable_redis: -#kolla_enable_sahara: -#kolla_enable_senlin: #kolla_enable_skyline: -#kolla_enable_solum: #kolla_enable_swift: #kolla_enable_swift_recon: #kolla_enable_swift_s3api: @@ -440,8 +431,6 @@ #kolla_enable_trove: #kolla_enable_trove_singletenant: #kolla_enable_venus: -#kolla_enable_vitrage: -#kolla_enable_vitrage_prometheus_datasource: #kolla_enable_watcher: #kolla_enable_zun: diff --git a/etc/kayobe/networks.yml b/etc/kayobe/networks.yml index e58ab44cf..17c9028c4 100644 --- a/etc/kayobe/networks.yml +++ b/etc/kayobe/networks.yml @@ -69,7 +69,7 @@ # # example_cidr: 10.0.0.0/24 # example_allocation_pool_start: 10.0.0.2 -# example_allocation_pool_start: 10.0.0.254 +# example_allocation_pool_end: 10.0.0.254 # example_gateway: 10.0.0.1 # example_vlan: 42 # diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml index cb19104f7..4db759fc7 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 "2023.2". +# Name of the current OpenStack release. Default is "2024.1". #openstack_release: -# Name of the current OpenStack branch. Default is "stable/2023.2". +# Name of the current OpenStack branch. Default is "stable/2024.1". #openstack_branch: ############################################################################### diff --git a/etc/kayobe/overcloud-dib.yml b/etc/kayobe/overcloud-dib.yml index abdb4ee20..f5f935202 100644 --- a/etc/kayobe/overcloud-dib.yml +++ b/etc/kayobe/overcloud-dib.yml @@ -14,9 +14,10 @@ #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_* -# variables defined below: {"name": "deployment_image", "elements": "{{ +# an image in a format accepted by the stackhpc.openstack.os_images role. +# Default is to build an image named "deployment_image" configured with the +# overcloud_dib_* variables defined below: +# {"name": "deployment_image", "elements": "{{ # overcloud_dib_elements }}", "env": "{{ overcloud_dib_env_vars }}", # "packages": "{{ overcloud_dib_packages }}"}. #overcloud_dib_host_images: @@ -57,15 +58,15 @@ #overcloud_dib_packages: # List of default git repositories containing Diskimage Builder (DIB) elements. -# See stackhpc.os-images role for usage. Default is empty. +# See stackhpc.openstack.os_images role for usage. Default is empty. #overcloud_dib_git_elements_default: # List of additional git repositories containing Diskimage Builder (DIB) -# elements. See stackhpc.os-images role for usage. Default is empty. +# elements. See stackhpc.openstack.os_images role for usage. Default is empty. #overcloud_dib_git_elements_extra: # List of git repositories containing Diskimage Builder (DIB) elements. See -# stackhpc.os-images role for usage. Default is a combination of +# stackhpc.openstack.os_images role for usage. Default is a combination of # overcloud_dib_git_elements_default and overcloud_dib_git_elements_extra. #overcloud_dib_git_elements: diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml index bc86fa627..541c07808 100644 --- a/etc/kayobe/seed.yml +++ b/etc/kayobe/seed.yml @@ -48,10 +48,8 @@ #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. +# contains a 'docker-volumes' logical volume for Docker volume storage. +# Default is false. #seed_lvm_group_data_enabled: # Seed LVM volume group for data. See mrlesmithjr.manage_lvm role for format. diff --git a/etc/kayobe/storage.yml b/etc/kayobe/storage.yml index e9e52dfe6..2cdac5bed 100644 --- a/etc/kayobe/storage.yml +++ b/etc/kayobe/storage.yml @@ -81,10 +81,8 @@ #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. +# this contains a 'docker-volumes' logical volume for Docker volume storage. +# Default is false. #storage_lvm_group_data_enabled: # Storage LVM volume group for data. See mrlesmithjr.manage_lvm role for From 9fb58db6959419b0bc4c2d49c9a2e8f9416484bd Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 5 Jun 2024 17:08:36 +0100 Subject: [PATCH 5/8] Sync with kayobe for 2024.1 release A few more patches have landed. kayobe commit: 6c6400f7cee845be0e5143036b5baa6e41c56fa3 Change-Id: Ic72818b070e12c23c4b5c90b0a49c87bdcfdcee9 --- etc/kayobe/globals.yml | 4 ++++ etc/kayobe/logging.yml | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 etc/kayobe/logging.yml diff --git a/etc/kayobe/globals.yml b/etc/kayobe/globals.yml index 50af1cb14..a97f74d1a 100644 --- a/etc/kayobe/globals.yml +++ b/etc/kayobe/globals.yml @@ -64,6 +64,10 @@ # to not specify a gather subset. #kayobe_ansible_setup_gather_subset: +# Global maximum failure percentage. By default this is undefined, which is +# equivalent to a value of 100. +#kayobe_max_fail_percentage: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes diff --git a/etc/kayobe/logging.yml b/etc/kayobe/logging.yml new file mode 100644 index 000000000..46033d268 --- /dev/null +++ b/etc/kayobe/logging.yml @@ -0,0 +1,11 @@ +--- +############################################################################### +# Logging configuration + +# Journald storage. One of: volatile, persistent, auto, or none. Defaults to +# `persistent`. +#journald_storage: + +############################################################################### +# Dummy variable to allow Ansible to accept this file. +workaround_ansible_issue_8743: yes From 205d070a13ade0c259f2f3c0e13d1d9593a1bbae Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 7 Jun 2024 08:50:20 +0000 Subject: [PATCH 6/8] Update .gitreview for stable/2024.1 Change-Id: I6a1a16e473c805a1993c3c5c8eff7484181278f9 --- .gitreview | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitreview b/.gitreview index b9adc8dd9..088e01d84 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.opendev.org port=29418 project=openstack/kayobe-config.git +defaultbranch=stable/2024.1 From 982bfae457ac0ab188a215e6d1f0183e9f02d565 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 7 Jun 2024 08:50:22 +0000 Subject: [PATCH 7/8] Update TOX_CONSTRAINTS_FILE for stable/2024.1 Update the URL to the upper-constraints file to point to the redirect rule on releases.openstack.org so that anyone working on this branch will switch to the correct upper-constraints list automatically when the requirements repository branches. Until the requirements repository has as stable/2024.1 branch, tests will continue to use the upper-constraints list on master. Change-Id: Ie1f7284da9b7d4a7ecf226c02e13ca45f87451ea --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 47adec2e2..3b00c00af 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ skipsdist = True [testenv] install_command = pip install {opts} {packages} deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1} -r{toxinidir}/test-requirements.txt [testenv:pep8] From 56d21e121434d5a3352db77ab0377fd2ed8a3cfd Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Mon, 16 Sep 2024 18:39:48 +0200 Subject: [PATCH 8/8] [2024.1-only] Synchronise with latest kayobe Change-Id: Ice2551c023db9674d6fd6596209bda3af8df60d6 --- etc/kayobe/infra-vms.yml | 16 ++++++++++++---- etc/kayobe/seed-vm.yml | 14 +++++++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml index a8f1fd9b2..e48004103 100644 --- a/etc/kayobe/infra-vms.yml +++ b/etc/kayobe/infra-vms.yml @@ -31,10 +31,12 @@ # Base image for the infra VM root volume. Default is # "https://cloud-images.ubuntu.com/jammy/current/jammy-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", -# or +# 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" and seed_vm_boot_firmware is "efi", +# "https://dl.rockylinux.org/vault/rocky/9.3/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2" +# when os_distribution is "rocky" and seed_vm_boot_firmware is not "efi" +# (default is "bios"), or # "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2" # otherwise. #infra_vm_root_image: @@ -58,6 +60,12 @@ # OS family. Needed for config drive generation. #infra_vm_os_family: +# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'bios'. +#infra_vm_boot_firmware: + +# Machine type. Libvirt default configuration is used. +#infra_vm_machine: + ############################################################################### # Infrastructure VM node configuration. diff --git a/etc/kayobe/seed-vm.yml b/etc/kayobe/seed-vm.yml index f10fbaa19..42aea8da5 100644 --- a/etc/kayobe/seed-vm.yml +++ b/etc/kayobe/seed-vm.yml @@ -32,9 +32,11 @@ # Base image for the seed VM root volume. Default is # "https://cloud-images.ubuntu.com/jammy/current/jammy-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", -# or +# "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2" +# when os_distribution is "rocky" and seed_vm_boot_firmware is "efi", +# "https://dl.rockylinux.org/vault/rocky/9.3/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2" +# when os_distribution is "rocky" and seed_vm_boot_firmware is not "efi" +# (default is "bios"), or # "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2" # otherwise. #seed_vm_root_image: @@ -61,6 +63,12 @@ # #seed_vm_interfaces: +# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'bios'. +#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