Merge "Drop openEuler support"
diff --git a/.zuul.yaml b/.zuul.yaml
index 3beae1f..001ac84 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -718,6 +718,7 @@
name: devstack-platform-ubuntu-jammy-ovn-source
parent: devstack-platform-ubuntu-jammy
description: Ubuntu 22.04 LTS (jammy) platform test (OVN from source)
+ voting: false
vars:
devstack_localrc:
OVN_BUILD_FROM_SOURCE: True
@@ -730,6 +731,7 @@
parent: tempest-full-py3
description: Ubuntu 22.04 LTS (jammy) platform test (OVS)
nodeset: openstack-single-node-jammy
+ voting: false
timeout: 9000
vars:
configure_swap_size: 8192
@@ -923,6 +925,7 @@
- devstack
- devstack-ipv6
- devstack-platform-centos-9-stream
+ - devstack-platform-ubuntu-jammy
- devstack-enforce-scope
- devstack-multinode
- devstack-unit-tests
diff --git a/inc/python b/inc/python
index 9382d35..d032a10 100644
--- a/inc/python
+++ b/inc/python
@@ -194,7 +194,6 @@
https_proxy="${https_proxy:-}" \
no_proxy="${no_proxy:-}" \
PIP_FIND_LINKS=$PIP_FIND_LINKS \
- SETUPTOOLS_SYS_PATH_TECHNIQUE=rewrite \
$cmd_pip $upgrade \
$@
result=$?
diff --git a/lib/neutron-legacy b/lib/neutron-legacy
index 253b457..88ac991 100644
--- a/lib/neutron-legacy
+++ b/lib/neutron-legacy
@@ -931,6 +931,9 @@
configure_keystone_authtoken_middleware $NEUTRON_CONF nova nova
+ # Configuration for placement client
+ configure_keystone_authtoken_middleware $NEUTRON_CONF placement placement
+
# Configure plugin
neutron_plugin_configure_service
}
diff --git a/tools/dbcounter/setup.cfg b/tools/dbcounter/setup.cfg
index f9f26f2..12300bf 100644
--- a/tools/dbcounter/setup.cfg
+++ b/tools/dbcounter/setup.cfg
@@ -8,7 +8,7 @@
license = Apache
[options]
-modules = dbcounter
+py_modules = dbcounter
entry_points =
[sqlalchemy.plugins]
dbcounter = dbcounter:LogCursorEventsPlugin