summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-01-14 14:27:38 +0000
committerGerrit Code Review <review@openstack.org>2021-01-14 14:27:38 +0000
commitf9035b251e7de50d398d1a240923862237164f1b (patch)
tree66aa3756836822db01eb528e6bf24288a10f197d
parente285c09c5a2daa119d2c4163af3b75c1b23dfb27 (diff)
parentb47d4306a0979b2a7801d2be03e566b1e1efaf80 (diff)
downloaddesignate-f9035b251e7de50d398d1a240923862237164f1b.tar.gz
Merge "fix database sync always get the wrong value" into stable/traintrain-em9.0.2
-rw-r--r--designate/storage/impl_sqlalchemy/migrate_repo/versions/070_liberty.py4
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":