Merge pull request #2079 from stackhpc/merge-upstream-2025.1

priteau · web-flow · commit 840924fba366 · 2026-01-13T13:01:22.000+01:00
Fix infra VM NTP configuration by merging upstream stable/2025.1
diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml
@@ -66,7 +66,7 @@
 # UUID of the root filesystem contained within the deployment image.
 # See below URL for instructions on how to extract it:
 # https://docs.openstack.org/ironic/latest/admin/raid.html#image-requirements
-# Default is none.
+# Default is an empty string.
 #kolla_bifrost_deploy_image_rootfs:
 
 # Custom cloud-init user-data passed to deploy of the deployment image.
diff --git a/etc/kayobe/compute.yml b/etc/kayobe/compute.yml
@@ -2,8 +2,9 @@
 ###############################################################################
 # Compute node configuration.
 
-# User with which to access the computes via SSH during bootstrap, in order
-# to setup the Kayobe user account. Default is {{ os_distribution }}.
+# User with which to access the compute nodes via SSH during bootstrap, in
+# order to setup the Kayobe user account. Default is 'cloud-user' if
+# os_distribution is set to centos, otherwise 'os_distribution'.
 #compute_bootstrap_user:
 
 ###############################################################################
@@ -208,7 +209,7 @@
 #compute_libvirt_ceph_repo_install:
 
 # Ceph package repository release to install on CentOS and Rocky hosts when
-# compute_libvirt_ceph_repo_install is true. Default is 'pacific'.
+# compute_libvirt_ceph_repo_install is true. Default is 'squid'.
 #compute_libvirt_ceph_repo_release:
 
 ###############################################################################
diff --git a/etc/kayobe/controllers.yml b/etc/kayobe/controllers.yml
@@ -3,7 +3,8 @@
 # Controller node configuration.
 
 # User with which to access the controllers via SSH during bootstrap, in order
-# to setup the Kayobe user account. Default is {{ os_distribution }}.
+# to setup the Kayobe user account. Default is 'cloud-user' if os_distribution
+# is set to centos, otherwise 'os_distribution'.
 #controller_bootstrap_user:
 
 ###############################################################################
diff --git a/etc/kayobe/globals.yml b/etc/kayobe/globals.yml
@@ -48,9 +48,10 @@
 # is "rocky".
 #os_distribution:
 
-# OS release. Valid options are "9-stream" when os_distribution is "centos", or
-# "9" when os_distribution is "rocky", or "noble" when os_distribution is
-# "ubuntu".
+# OS release. Valid options are "9-stream" and "10-stream" (with "9-stream"
+# being the default) when os_distribution is "centos", "9" and "10" (with "9"
+# being the default) 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
@@ -31,11 +31,14 @@
 
 # Base image for the infra VM root volume. Default is
 # "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",
-# or
-# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
+# 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 os_release is "9",
+# "https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2"
+# when os_distribution is "rocky" and os_release is "10",
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-9-latest.x86_64.qcow2"
+# when os_distribution is "centos" and os_release is "9-stream", or
+# "https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-10-latest.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
 
@@ -68,7 +71,8 @@
 # Infrastructure VM node configuration.
 
 # User with which to access the infrastructure vm via SSH during bootstrap, in
-# order to setup the Kayobe user account.
+# order to setup the Kayobe user account. Default is 'cloud-user' if
+# os_distribution is set to centos, otherwise 'os_distribution'.
 #infra_vm_bootstrap_user:
 
 ###############################################################################
diff --git a/etc/kayobe/inventory/groups b/etc/kayobe/inventory/groups
@@ -109,6 +109,7 @@ seed
 seed
 seed-hypervisor
 overcloud
+infra-vms
 
 ###############################################################################
 # Baremetal compute node groups.
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
@@ -85,7 +85,7 @@ kolla_base_distro_and_version: "{{ kolla_base_distro }}-{{ kolla_base_distro_ver
 # case Quay.io will be used.
 #kolla_docker_registry:
 
-# Docker namespace to use for Kolla images. Default is 'kolla'.
+# Docker namespace to use for Kolla images. Default is 'openstack.kolla'.
 kolla_docker_namespace: stackhpc
 
 # Username to use to access a docker registry. Default is not set, in which
diff --git a/etc/kayobe/monitoring.yml b/etc/kayobe/monitoring.yml
@@ -3,7 +3,8 @@
 # Monitoring node configuration.
 
 # User with which to access the monitoring nodes via SSH during bootstrap, in
-# order to setup the Kayobe user account.
+# order to setup the Kayobe user account. Default is 'cloud-user' if
+# os_distribution is set to centos, otherwise 'os_distribution'.
 #monitoring_bootstrap_user:
 
 ###############################################################################
diff --git a/etc/kayobe/seed-hypervisor.yml b/etc/kayobe/seed-hypervisor.yml
@@ -3,7 +3,8 @@
 # Seed hypervisor node configuration.
 
 # User with which to access the seed hypervisor via SSH during bootstrap, in
-# order to setup the Kayobe user account. Default is {{ os_distribution }}.
+# order to setup the Kayobe user account. Default is 'cloud-user' if
+# os_distribution is set to centos, otherwise 'os_distribution'.
 #seed_hypervisor_bootstrap_user:
 
 ###############################################################################
diff --git a/etc/kayobe/seed-vm.yml b/etc/kayobe/seed-vm.yml
@@ -33,11 +33,12 @@
 # "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" 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"
+# when os_distribution is "rocky" and os_release is "9",
+# "https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2"
+# when os_distribution is "rocky" and os_release is "10",
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-9-latest.x86_64.qcow2"
+# when os_distribution is "centos" and os_release is "9-stream", or
+# "https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-10-latest.x86_64.qcow2"
 # otherwise.
 #seed_vm_root_image:
 
diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml
@@ -3,7 +3,8 @@
 # Seed node configuration.
 
 # User with which to access the seed via SSH during bootstrap, in order to
-# setup the Kayobe user account. Default is {{ os_distribution }}.
+# setup the Kayobe user account. Default is 'cloud-user' if os_distribution is
+# set to centos, otherwise 'os_distribution'.
 #seed_bootstrap_user:
 
 ###############################################################################
@@ -155,9 +156,10 @@ seed_redfish_exporter_container:
 # Example:
 # seed_containers:
 #   squid:
-#     image: "stackhpc/squid:3.5.20-1"
+#     image: "docker.io/stackhpc/squid"
 #     pre: "{{ kayobe_env_config_path }}/containers/squid/pre.yml"
 #     post: "{{ kayobe_env_config_path }}/containers/squid/post.yml"
+#     tag: "3.5.20-1"
 #
 seed_containers: >-
   {{ {} | combine(seed_pulp_container if seed_pulp_container_enabled | bool else {})
diff --git a/etc/kayobe/storage.yml b/etc/kayobe/storage.yml
@@ -2,8 +2,9 @@
 ###############################################################################
 # Storage node configuration.
 
-# User with which to access the storages via SSH during bootstrap, in order
-# to setup the Kayobe user account. Default is {{ os_distribution }}.
+# User with which to access the storage nodes via SSH during bootstrap, in
+# order to setup the Kayobe user account. Default is 'cloud-user' if
+# os_distribution is set to centos, otherwise 'os_distribution'.
 #storage_bootstrap_user:
 
 ###############################################################################
diff --git a/releasenotes/notes/infra-vms-ntp-group-dfe9766dd6f5c938.yaml b/releasenotes/notes/infra-vms-ntp-group-dfe9766dd6f5c938.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix missing NTP configuration for infrastructure VMs. Operators should run
+    ``kayobe infra vm host configure --tags ntp``.
