From d787ee45c0f395d8666c978f499b5d0539b984b0 Mon Sep 17 00:00:00 2001 From: Erik Olof Gunnar Andersson Date: Fri, 14 Jun 2019 00:05:11 -0700 Subject: [PATCH] Only register dynamic pool options when running designate-manage We only need to load this code path when converting an old designate configuration (pre-mitaka) into a pools.yaml file. Change-Id: Ia9587880ca2428c0b3af074f0cb2a873859685ec --- designate/manage/pool.py | 5 +++++ designate/utils.py | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/designate/manage/pool.py b/designate/manage/pool.py index 7311c0d01..6dabc6e8e 100644 --- a/designate/manage/pool.py +++ b/designate/manage/pool.py @@ -66,6 +66,11 @@ class PoolCommands(base.Commands): default='/etc/designate/pools.yaml') def export_from_config(self, file): self._startup() + + # Avoid circular dependency imports + from designate import pool_manager + pool_manager.register_dynamic_pool_options() + try: pools = self.central_api.find_pools(self.context) except messaging.exceptions.MessagingTimeout: diff --git a/designate/utils.py b/designate/utils.py index 98cad2268..fe32fb8f8 100644 --- a/designate/utils.py +++ b/designate/utils.py @@ -82,10 +82,6 @@ def read_config(prog, argv): default_config_files=config_files) config.set_defaults() - # Avoid circular dependency imports - from designate import pool_manager - pool_manager.register_dynamic_pool_options() - def resource_string(*args): if len(args) == 0: