Merge remote-tracking branch 'origin/stackhpc/wallaby' into HEAD

etc/kayobe/kolla.yml

@@ -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:

etc/kayobe/kolla/globals.yml

@@ -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: FIXME-BUILD-NEW-IMAGE
 prometheus_node_exporter_tag: xena-20230310T170439
 {% else %}
 bifrost_tag: xena-20230215T195824
@@ -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: FIXME-BUILD-NEW-IMAGE
 prometheus_node_exporter_tag: xena-20230315T164024
 {% endif %}
 

releasenotes/notes/fixes-broken-etcdgw-library-2af353ec0dc42109.yaml

@@ -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.