diff options
| author | Zuul <zuul@review.opendev.org> | 2020-11-19 08:03:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-11-19 08:03:17 +0000 |
| commit | 9f28e73823dfc50a7b4fb3f8020520131b452eb2 (patch) | |
| tree | c7bebf5d82d0f339bb03f57836340fbef377f512 | |
| parent | 06883ab79ec6567282f86cf3ac90f7dd4d83b1dd (diff) | |
| parent | 9cf3b8ea4867e417f6e2f74b0647b71268b14848 (diff) | |
| download | designate-9f28e73823dfc50a7b4fb3f8020520131b452eb2.tar.gz | |
Merge "fix database sync always get the wrong value" into stable/ussuri
| -rw-r--r-- | designate/storage/impl_sqlalchemy/migrate_repo/versions/070_liberty.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/070_liberty.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/070_liberty.py index 748ca8da..f9e95518 100644 --- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/070_liberty.py +++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/070_liberty.py @@ -21,10 +21,12 @@ from sqlalchemy import (Table, MetaData, Column, String, Text, Integer, from oslo_config import cfg from oslo_utils import timeutils +from designate.conf import central from designate.sqlalchemy.types import UUID CONF = cfg.CONF +central.register_opts(CONF) RESOURCE_STATUSES = ['ACTIVE', 'PENDING', 'DELETED', 'ERROR'] RECORD_TYPES = ['A', 'AAAA', 'CNAME', 'MX', 'SRV', 'TXT', 'SPF', 'NS', 'PTR', @@ -367,7 +369,7 @@ def default_shard(context, id_col): def upgrade(migrate_engine): metadata.bind = migrate_engine - default_pool_id = cfg.CONF['service:central'].default_pool_id + default_pool_id = CONF['service:central'].default_pool_id with migrate_engine.begin() as conn: if migrate_engine.name == "mysql": |