From 9cf3b8ea4867e417f6e2f74b0647b71268b14848 Mon Sep 17 00:00:00 2001 From: "wu.chunyang" Date: Fri, 11 Sep 2020 18:57:49 +0800 Subject: fix database sync always get the wrong value we create a default pool when exec database sync, and get the default_pool_id from designate.conf, but we did not register this opt before using it, so we always get the default value which is wrong Change-Id: I500c932a502db24332aad95c54713b7056bc1df4 Closes-Bug: 1881277 Related-Bug: https://bugs.launchpad.net/kolla-ansible/+bug/1855877 (cherry picked from commit 609437e73deff55e9f5548538f093d01f0addd1b) --- .../storage/impl_sqlalchemy/migrate_repo/versions/070_liberty.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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": -- cgit v1.2.1