Merge pull request #2083 from stackhpc/merge-upstream-2024.1

priteau · web-flow · commit 4594fe937c4c · 2026-01-23T16:05:39.000+01:00
Fix infra VM NTP configuration by merging upstream unmaintained/2024.1
diff --git a/.gitreview b/.gitreview
@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/kayobe-config.git
-defaultbranch=stable/2024.1
+defaultbranch=unmaintained/2024.1
diff --git a/etc/kayobe/apt.yml b/etc/kayobe/apt.yml
@@ -37,6 +37,8 @@ apt_keys:
     filename: ceph.asc
 
 # A list of Apt repositories. Each item is a dict with the following keys:
+# * name: the <name>.sources filename part. Optional. Default is 'kayobe' and
+#   the default filename is 'kayobe.sources'.
 # * types: whitespace-separated list of repository types, e.g. deb or deb-src
 #   (optional, default is 'deb')
 # * url: URL of the repository
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:
 
 ###############################################################################
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
@@ -49,8 +49,8 @@
 #os_distribution:
 
 # OS release. Valid options are "9-stream" when os_distribution is "centos", or
-# "9" when os_distribution is "rocky", or "jammy" and "noble" when os_distribution is
-# "ubuntu".
+# "9" when os_distribution is "rocky", or "jammy" and "noble" (with "jammy"
+# being the default) when os_distribution is "ubuntu".
 #os_release:
 
 ###############################################################################
diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml
@@ -31,13 +31,16 @@
 
 # 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" and distribution_major_version is '22',
+# "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
+# when os_distribution is "ubuntu" and distribution_major_version is not '22',
 # 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"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
 
@@ -70,7 +73,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/openstack.yml b/etc/kayobe/openstack.yml
@@ -9,7 +9,7 @@
 # NOTE(upgrade): Update to current release codename.
 openstack_release_codename: "caracal"
 
-# Name of the current OpenStack branch. Default is "stable/2024.1".
+# Name of the current OpenStack branch. Default is "unmaintained/2024.1".
 #openstack_branch:
 
 ###############################################################################
diff --git a/etc/kayobe/proxy.yml b/etc/kayobe/proxy.yml
@@ -12,8 +12,9 @@
 
 # List of domains, hostnames, IP addresses and networks for which no proxy is
 # used. Defaults to ["127.0.0.1", "localhost", "{{ ('http://' ~
-# docker_registry) | urlsplit('hostname') }}"] if docker_registry is set, or
-# ["127.0.0.1", "localhost"] otherwise. This is configured only if either
+# docker_registry) | urlsplit('hostname') }}","{{ kolla_internal_vip_address
+# }}"] if docker_registry is set, or ["127.0.0.1", "localhost","{{
+# kolla_internal_vip_address }}"] otherwise. This is configured only if either
 # http_proxy or https_proxy is set.
 #no_proxy:
 
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
@@ -31,13 +31,15 @@
 
 # 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",
+# when os_distribution is "ubuntu" and distribution_major_version is '22',
+# "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
+# when os_distribution is "ubuntu" and distribution_major_version is not '22',
 # "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"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-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/etc/kayobe/time.yml b/etc/kayobe/time.yml
@@ -33,6 +33,20 @@
 # Synchronise hardware clock with system time. Default is true.
 #chrony_rtcsync_enabled:
 
+# Force synchronisation from NTP sources. This methods may jump the clock by
+# large values which can cause issues with some software. Disabled by default.
+#ntp_force_sync:
+
+# Maximum number of tries used by the `chronyc waitsync` command. Only used
+# when ntp_force_sync is true. Default is 60 which waits for a maximum of 10
+# minutes (60 times 10 seconds).
+#chrony_waitsync_max_tries:
+
+# Maximum correction used by the `chronyc waitsync` command. Only used when
+# ntp_force_sync is true. Default is 0.01 which waits for the remaining
+# correction to be less than 10 milliseconds.
+#chrony_waitsync_max_correction:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/releasenotes/notes/infra-vms-ntp-group-45ade04fe885c3f8.yaml b/releasenotes/notes/infra-vms-ntp-group-45ade04fe885c3f8.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix missing NTP configuration for infrastructure VMs. Operators should run
+    ``kayobe infra vm host configure --tags ntp``.
