Merge pull request #179 from stackhpc/upstream/2024.1-2024-12-16

Synchronise 2024.1 with upstream
stackhpc · Dec 16, 2024 · 8676641 · 8676641
2 parents f146c6e + b474792
commit 8676641
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.zuul.yaml b/.zuul.yaml
@@ -51,7 +51,7 @@
 
 - job:
     name: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.27
-    parent: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1
+    parent: magnum-tempest-plugin-tests-cluster-2024-1
     vars:
       devstack_localrc:
         MAGNUM_KUBECTL_TAG: v1.27.8

diff --git a/magnum/db/sqlalchemy/api.py b/magnum/db/sqlalchemy/api.py
@@ -64,7 +64,8 @@ def _session_for_write():
 
 
 def _wrap_session(session):
-    if CONF.profiler.enabled and CONF.profiler.trace_sqlalchemy:
+    if (hasattr(CONF, 'profiler') and CONF.profiler.enabled and
+       CONF.profiler.trace_sqlalchemy):
         session = profiler_sqlalchemy.wrap_session(sa, session)
     return session