Skip to content

Commit ab4ab4f

Browse files
authored
Merge pull request #64 from stackhpc/upstream/xena-2022-10-17
Synchronise xena with upstream
2 parents 38c7277 + fc00e61 commit ab4ab4f

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

ansible/group_vars/all/infra-vms

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ infra_vm_root_format: qcow2
4646
# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
4747
# when os_distribution is "rocky",
4848
# or
49-
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
49+
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2"
5050
# otherwise.
5151
infra_vm_root_image: >-
5252
{%- if os_distribution == 'ubuntu' %}
5353
https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
5454
{%- elif os_distribution == 'rocky' %}
5555
https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
5656
{%- else -%}
57-
https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2
57+
https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2
5858
{%- endif %}
5959

6060
# Capacity of the infra VM data volume.

ansible/group_vars/all/seed-vm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ seed_vm_root_format: qcow2
4646
# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
4747
# when os_distribution is "rocky",
4848
# or
49-
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
49+
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2"
5050
# otherwise.
5151
seed_vm_root_image: >-
5252
{%- if os_distribution == 'ubuntu' %}
5353
https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
5454
{%- elif os_distribution == 'rocky' %}
5555
https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
5656
{%- else -%}
57-
https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2
57+
https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2
5858
{%- endif %}
5959

6060
# Capacity of the seed VM data volume.

etc/kayobe/infra-vms.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
# 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/seed-vm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# 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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
features:
3+
- |
4+
Updates base CentOS Stream 8 cloud image to
5+
CentOS-Stream-GenericCloud-8-20220913.0.x86_64.

zuul.d/project.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
- project:
3+
queue: kayobe
34
templates:
45
- openstack-cover-jobs
56
- openstack-python3-xena-jobs
@@ -33,7 +34,6 @@
3334
- kayobe-infra-vm-ubuntu-focal
3435

3536
gate:
36-
queue: kayobe
3737
jobs:
3838
- kayobe-tox-ansible-syntax
3939
- kayobe-tox-ansible

0 commit comments

Comments
 (0)