From aec3ae22f51a11620fa97f40cef2ee1bc478e0be Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Mon, 21 Jul 2025 09:52:20 +0200
Subject: [PATCH] Synchronise configuration with master

Synchronised with kayobe @ 4d24fe7e97e6fb02185c0a2f1e44896718c4ac6c.

Change-Id: Ic841668eb922aec326cf2d36cedb12852537bbf5
Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
---
 etc/kayobe/bifrost.yml   | 3 +++
 etc/kayobe/infra-vms.yml | 2 +-
 etc/kayobe/kolla.yml     | 1 +
 etc/kayobe/openstack.yml | 4 ++--
 etc/kayobe/seed-vm.yml   | 2 +-
 etc/kayobe/seed.yml      | 3 ++-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml
index 741bbd8..d9c2e1e 100644
--- a/etc/kayobe/bifrost.yml
+++ b/etc/kayobe/bifrost.yml
@@ -4,6 +4,9 @@
 ###############################################################################
 # Bifrost installation.
 
+# Whether to install Bifrost. Default is true.
+#kolla_enable_bifrost:
+
 # URL of Bifrost source code repository.
 #kolla_bifrost_source_url:
 
diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml
index cbfa34e..3645065 100644
--- a/etc/kayobe/infra-vms.yml
+++ b/etc/kayobe/infra-vms.yml
@@ -35,7 +35,7 @@
 # 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"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
 
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 929fc6d..30ca8cc 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -284,6 +284,7 @@
 
 #kolla_enable_aodh:
 #kolla_enable_barbican:
+#kolla_enable_bifrost:
 #kolla_enable_blazar:
 #kolla_enable_ceilometer:
 #kolla_enable_ceilometer_horizon_policy_file:
diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml
index 081e4be..1acfd07 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 "2025.1".
+# Name of the current OpenStack release. Default is "master".
 #openstack_release:
 
-# Name of the current OpenStack branch. Default is "stable/2025.1".
+# Name of the current OpenStack branch. Default is "master".
 #openstack_branch:
 
 ###############################################################################
diff --git a/etc/kayobe/seed-vm.yml b/etc/kayobe/seed-vm.yml
index aa805d8..3c8352a 100644
--- a/etc/kayobe/seed-vm.yml
+++ b/etc/kayobe/seed-vm.yml
@@ -35,7 +35,7 @@
 # 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"
+# "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
index 541c078..48bcfb8 100644
--- a/etc/kayobe/seed.yml
+++ b/etc/kayobe/seed.yml
@@ -98,9 +98,10 @@
 # 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: