Merge pull request #385 from stackhpc/sync-xena

Sync with upstream stable/xena
stackhpc · Feb 9, 2023 · 459d7e6 · 459d7e6
2 parents 780cd30 + 4a380f9
commit 459d7e6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/etc/kayobe/apt.yml b/etc/kayobe/apt.yml
@@ -21,11 +21,12 @@
 
 # List of apt keys. Each item is a dict containing the following keys:
 # * url: URL of key
-# * filename: Name of a file in which to store the downloaded key
+# * filename: Name of a file in which to store the downloaded key. The
+#   extension should be '.asc' for ASCII-armoured keys, or '.gpg' otherwise.
 # Default is an empty list.
 #apt_keys:
 
-# A list of Apt repositories.
+# A list of Apt repositories. Each item is a dict with the following keys:
 # * 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/infra-vms.yml b/etc/kayobe/infra-vms.yml
@@ -32,10 +32,10 @@
 # Base image for the infra VM root volume. Default is
 # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu", or
-# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
+# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
 

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
@@ -75,7 +75,7 @@ kolla_ansible_source_version: "{{ stackhpc_kolla_ansible_source_version }}"
 #kolla_install_type:
 
 # URL of docker registry to use for Kolla images. Default is not set, in which
-# case Dockerhub will be used.
+# case Quay.io will be used.
 #kolla_docker_registry:
 
 # Docker namespace to use for Kolla images. Default is 'kolla'.

diff --git a/etc/kayobe/seed-vm.yml b/etc/kayobe/seed-vm.yml
@@ -25,8 +25,12 @@
 
 # Base image for the seed VM root volume. Default is
 # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
-# when os_distribution is "ubuntu", or
-# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2"
+# when os_distribution is "ubuntu",
+# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
+# when os_distribution is "rocky",
+# or
+# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2"
+# otherwise.
 #seed_vm_root_image:
 
 # Capacity of the seed VM data volume.

diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml
@@ -137,7 +137,6 @@ seed_squid_container:
 # Example:
 # seed_containers:
 #   squid:
-#     name: "squid"
 #     image: "stackhpc/squid:3.5.20-1"
 #     pre: "{{ kayobe_env_config_path }}/containers/squid/pre.yml"
 #     post: "{{ kayobe_env_config_path }}/containers/squid/post.yml"