Revert "Add workaround for buggy etcdgw library (stackhpc#446)"

This reverts commit cdc5a27. This workaround is not required in Yoga.
g0rgamesh · Mar 22, 2023 · ff86865 · ff86865
1 parent 34e5a08
commit ff86865
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
@@ -354,16 +354,6 @@ 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:

diff --git a/releasenotes/notes/fixes-broken-etcdgw-library-2af353ec0dc42109.yaml b/releasenotes/notes/fixes-broken-etcdgw-library-2af353ec0dc42109.yaml