Skip to content

Commit 1e9eeb0

Browse files
committed
Synchronise with kayobe stable/yoga
Change-Id: I5ef935eefb8236395617d68a98c9f1adbc5effaa
1 parent add130e commit 1e9eeb0

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

etc/kayobe/globals.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
#os_distribution:
5151

5252
# OS release. Valid options are "8-stream" when os_distribution is "centos", or
53-
# "8" when os_distribution is "rocky", or "focal" when os_distribution is
54-
# "ubuntu".
53+
# "8" when os_distribution is "rocky", or "focal" and "jammy" when
54+
# os_distribution is "ubuntu".
5555
#os_release:
5656

5757
###############################################################################

etc/kayobe/infra-vms.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
# Base image for the infra VM root volume. Default is
3333
# "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
3434
# when os_distribution is "ubuntu", or
35-
# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
35+
# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
3636
# when os_distribution is "rocky",
3737
# or
38-
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
38+
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2"
3939
# otherwise.
4040
#infra_vm_root_image:
4141

etc/kayobe/kolla.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
#kolla_install_type:
7676

7777
# URL of docker registry to use for Kolla images. Default is not set, in which
78-
# case Dockerhub will be used.
78+
# case Quay.io will be used.
7979
#kolla_docker_registry:
8080

8181
# Docker namespace to use for Kolla images. Default is 'kolla'.
@@ -417,7 +417,6 @@
417417
#kolla_enable_telegraf:
418418
#kolla_enable_trove:
419419
#kolla_enable_trove_singletenant:
420-
#kolla_enable_venus:
421420
#kolla_enable_vitrage:
422421
#kolla_enable_vitrage_prometheus_datasource:
423422
#kolla_enable_watcher:

etc/kayobe/seed-vm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
# Base image for the seed VM root volume. Default is
2727
# "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
2828
# when os_distribution is "ubuntu",
29-
# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
29+
# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
3030
# when os_distribution is "rocky",
3131
# or
32-
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
32+
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2"
3333
# otherwise.
3434
#seed_vm_root_image:
3535

etc/kayobe/seed.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
# Example:
101101
# seed_containers:
102102
# squid:
103-
# name: "squid"
104103
# image: "stackhpc/squid:3.5.20-1"
105104
# pre: "{{ kayobe_env_config_path }}/containers/squid/pre.yml"
106105
# post: "{{ kayobe_env_config_path }}/containers/squid/post.yml"

0 commit comments

Comments
 (0)