diff --git a/.zuul.yaml b/.zuul.yaml index 45e52919e..6041eafda 100644 --- 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 index 5b5f0ac45..05c93fe3c 100644 --- 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