Skip to content

Sync wallaby into xena #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 22, 2023
Merged

Sync wallaby into xena #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6e2f2dc
fix virtualenv ci failure
Alex-Welsh Mar 9, 2023
992e2fe
CI: Install python3-venv on Ubuntu in configure-aio-resources.yml
markgoddard Mar 13, 2023
531dfd1
Merge pull request #441 from stackhpc/wallaby-fix-ci
markgoddard Mar 15, 2023
cdc5a27
Add workaround for buggy etcdgw library (#446)
jovial Mar 20, 2023
4de4d6e
Merge remote-tracking branch 'origin/stackhpc/wallaby' into HEAD
jovial Mar 20, 2023
a2c3d1f
Update neutron tag
jovial Mar 21, 2023
320ba8b
Switch to using a specific version of CentOS Stream (#454)
jovial Mar 22, 2023
2b4279c
Merge remote-tracking branch 'origin/stackhpc/wallaby' into bugfix/xe…
jovial Mar 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/stackhpc-all-in-one.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
vm_image:
description: Image for the all-in-one VM
type: string
default: CentOS-stream8
default: bb8c0a34-533f-42fb-a49b-3461e677f3f6
vm_interface:
description: Default network interface name
type: string
Expand Down
10 changes: 10 additions & 0 deletions etc/kayobe/kolla.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,16 @@ kolla_build_blocks:
RUN sed -i 's/"pc-q35-rhel8.5.0"/"pc-q35-*"/' /usr/share/qemu/firmware/50-edk2-ovmf-cc.json
{% endif %}
{% endraw %}
neutron_server_footer: |
# This is a workaround for a bug in etcd3gw that was fixed in 1.0.1, but not in v0.2.3.
# https://opendev.org/openstack/etcd3gw/commit/ed899b34e464862525f76fff2377a2cceeb65af7
{% raw %}
{% if base_distro == 'centos' %}
RUN sed -i 's/decode_unicode=True/decode_unicode=False/' /var/lib/kolla/venv/lib/python3.6/site-packages/etcd3gw/watch.py
{% elif base_distro == 'ubuntu' %}
RUN sed -i 's/decode_unicode=True/decode_unicode=False/' /var/lib/kolla/venv/lib/python3.8/site-packages/etcd3gw/watch.py
{% endif %}
{% endraw %}

# Dict mapping image customization variable names to their values.
# Each variable takes the form:
Expand Down
4 changes: 2 additions & 2 deletions etc/kayobe/kolla/globals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ blazar_tag: xena-20230315T122920
caso_tag: xena-20230315T122920
ironic_tag: xena-20230316T162305
ironic_dnsmasq_tag: xena-20230214T150257
neutron_tag: xena-20230307T142413
neutron_tag: xena-20230320T143013
prometheus_node_exporter_tag: xena-20230310T170439
{% else %}
bifrost_tag: xena-20230215T195824
Expand All @@ -22,7 +22,7 @@ caso_tag: xena-20230315T122918
ironic_tag: xena-20230317T090705
ironic_dnsmasq_tag: xena-20230215T164524
keystone_tag: xena-20230308T120251
neutron_tag: xena-20230307T142414
neutron_tag: xena-20230320T143007
prometheus_node_exporter_tag: xena-20230315T164024
{% endif %}

Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/fixes-broken-etcdgw-library-2af353ec0dc42109.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
fixes:
- |
The etcdgw library in the neutron-server container has been patched to
workaround a python3 incompatability. This affects the batching feature in
networking generic switch.
7 changes: 6 additions & 1 deletion terraform/aio/vm.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,14 @@ variable "aio_vm_subnet" {
type = string
}

locals {
image_is_uuid = length(regexall("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$", var.aio_vm_image)) > 0
}

data "openstack_images_image_v2" "image" {
name = var.aio_vm_image
most_recent = true
count = local.image_is_uuid ? 0 : 1
}

data "openstack_networking_subnet_v2" "network" {
Expand All @@ -52,7 +57,7 @@ resource "openstack_compute_instance_v2" "kayobe-aio" {
}

block_device {
uuid = data.openstack_images_image_v2.image.id
uuid = local.image_is_uuid ? var.aio_vm_image: data.openstack_images_image_v2.image[0].id
source_type = "image"
volume_size = 100
boot_index = 0
Expand Down