Merge pull request #261 from stackhpc/upstream/2025.1-2026-03-02

Synchronise 2025.1 with upstream

Author: priteau

neutron/services/logapi/drivers/manager.py

@@ -68,14 +68,18 @@ def __init__(self):
         self._drivers = set()
         self.rpc_required = False
         registry.publish(log_const.LOGGING_PLUGIN, events.AFTER_INIT, self)
-
-        if self.rpc_required:
-            self.logging_rpc = server_rpc.LoggingApiNotification()
+        self._logging_rpc = None
 
     @property
     def drivers(self):
         return self._drivers
 
+    @property
+    def logging_rpc(self):
+        if self.rpc_required and not self._logging_rpc:
+            self._logging_rpc = server_rpc.LoggingApiNotification()
+        return self._logging_rpc
+
     def register_driver(self, driver):
         """Register driver with logging plugin.
 

tox.ini

@@ -3,6 +3,13 @@ envlist = docs,py3,pep8
 minversion = 3.18.0
 skipsdist = False
 ignore_basepython_conflict = True
+# NOTE(elod.illes): latest virtualenv bundles setuptools 82.0.0, which
+# dropped pkg_resources module source from the package, which is used
+# in pbr-6.1.1, thus virtualenv needs to be pinned to fix the gate.
+# also tox needs to be pinned to handle missing packaging.pylock
+requires =
+    tox<4.44.0
+    virtualenv<20.37.0
 
 [testenv]
 description =