diff options
author | Zuul <zuul@review.opendev.org> | 2020-09-21 19:37:39 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2020-09-21 19:37:40 +0000 |
commit | 2168b4367d483ce420afee4bc1e5fca371cc40b8 (patch) | |
tree | d3bd3e20b1236d0c4aec4c6b8d367ef343543a69 | |
parent | 185d92d230bdf8149b3ae3f6d1730ec23c0514d7 (diff) | |
parent | 609437e73deff55e9f5548538f093d01f0addd1b (diff) | |
download | designate-2168b4367d483ce420afee4bc1e5fca371cc40b8.tar.gz |
Merge "fix database sync always get the wrong value"11.0.0.0rc111.0.0
-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": |