Skip to content

Commit

Permalink
Merge pull request #64 from stackhpc/upstream/xena-2022-10-17
Browse files Browse the repository at this point in the history
Synchronise xena with upstream
  • Loading branch information
markgoddard authored Oct 17, 2022
2 parents 38c7277 + fc00e61 commit ab4ab4f
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
4 changes: 2 additions & 2 deletions ansible/group_vars/all/infra-vms
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ infra_vm_root_format: 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-20210603.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: >-
{%- if os_distribution == 'ubuntu' %}
https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
{%- elif os_distribution == 'rocky' %}
https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
{%- else -%}
https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2
https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2
{%- endif %}

# Capacity of the infra VM data volume.
Expand Down
4 changes: 2 additions & 2 deletions ansible/group_vars/all/seed-vm
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ seed_vm_root_format: 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-20210603.0.x86_64.qcow2"
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2"
# otherwise.
seed_vm_root_image: >-
{%- if os_distribution == 'ubuntu' %}
https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
{%- elif os_distribution == 'rocky' %}
https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
{%- else -%}
https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2
https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2
{%- endif %}

# Capacity of the seed VM data volume.
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/infra-vms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
# 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-20210603.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:

Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/seed-vm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
# 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-20210603.0.x86_64.qcow2"
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2"
# otherwise.
#seed_vm_root_image:

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
features:
- |
Updates base CentOS Stream 8 cloud image to
CentOS-Stream-GenericCloud-8-20220913.0.x86_64.
2 changes: 1 addition & 1 deletion zuul.d/project.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
- project:
queue: kayobe
templates:
- openstack-cover-jobs
- openstack-python3-xena-jobs
Expand Down Expand Up @@ -33,7 +34,6 @@
- kayobe-infra-vm-ubuntu-focal

gate:
queue: kayobe
jobs:
- kayobe-tox-ansible-syntax
- kayobe-tox-ansible
Expand Down

0 comments on commit ab4ab4f

Please sign in to comment.