From ae43625781114f88413adb5fa2741598115ca104 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 29 Oct 2020 17:09:31 +0000 Subject: [PATCH] db: Remove "support" for configurable migration backends This doesn't actually do anything, and hasn't since we merged change I77921366a05ba6f9841143af89c1f4059d8454c6 way back in Ocata. Drop it. Change-Id: I623b2ffb8bdd72525241835b5d1164c275f9fe73 Implements: blueprint remove-sqlalchemy-migrate Signed-off-by: Stephen Finucane --- .../contributor/database_architecture.rst | 6 ------ glance/db/migration.py | 17 ----------------- setup.cfg | 2 -- 3 files changed, 25 deletions(-) diff --git a/doc/source/contributor/database_architecture.rst b/doc/source/contributor/database_architecture.rst index f71063c5ca..c9dab9ff5f 100644 --- a/doc/source/contributor/database_architecture.rst +++ b/doc/source/contributor/database_architecture.rst @@ -250,12 +250,6 @@ of an *Image* object. Glance Database Backends ~~~~~~~~~~~~~~~~~~~~~~~~ -Migration Backends ------------------- - -.. list-plugins:: glance.database.migration_backend - :detailed: - Metadata Backends ----------------- diff --git a/glance/db/migration.py b/glance/db/migration.py index 08268b703e..90d3fd866c 100644 --- a/glance/db/migration.py +++ b/glance/db/migration.py @@ -19,30 +19,13 @@ """Database setup and migration commands.""" -import threading - from oslo_config import cfg from oslo_db import options as db_options -from stevedore import driver -_IMPL = None -_LOCK = threading.Lock() - db_options.set_defaults(cfg.CONF) -def get_backend(): - global _IMPL - if _IMPL is None: - with _LOCK: - if _IMPL is None: - _IMPL = driver.DriverManager( - "glance.database.migration_backend", - cfg.CONF.database.backend).driver - return _IMPL - - # Migration-related constants EXPAND_BRANCH = 'expand' CONTRACT_BRANCH = 'contract' diff --git a/setup.cfg b/setup.cfg index 1e77e79e1d..5842114102 100644 --- a/setup.cfg +++ b/setup.cfg @@ -56,8 +56,6 @@ oslo.config.opts = glance = glance.opts:list_image_import_opts oslo.config.opts.defaults = glance.api = glance.common.config:set_config_defaults -glance.database.migration_backend = - sqlalchemy = oslo_db.sqlalchemy.migration glance.database.metadata_backend = sqlalchemy = glance.db.sqlalchemy.metadata