summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartosz Zurkowski <b.zurkowski@samsung.com>2019-02-28 15:16:17 +0100
committerKasper Hasior <k.hasior@samsung.com>2019-02-28 15:16:17 +0100
commit75784f94b1411a325ab3bdff4c71d2e5aa2abc2b (patch)
tree33886abe280dd727e5ef584f8ff033677e8ac309
parentc2911f55258c06165724d2f90896bc9a155829f2 (diff)
downloadtrove-11.0.0.tar.gz
Fix modules import orderstein-em11.0.0.0rc111.0.0
Change fixes placement of single module import. Previous import placement prevented configuration options from being loaded in correct order in relation to other modules. As a result modules using configuration on Trove service startup did not see modified configuration and behave in unexpected way. Change-Id: I22edfcb80ecb597826cd01f0aad448cfa169b422
-rw-r--r--trove/cmd/taskmanager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/trove/cmd/taskmanager.py b/trove/cmd/taskmanager.py
index 39d8a767..9e181a0c 100644
--- a/trove/cmd/taskmanager.py
+++ b/trove/cmd/taskmanager.py
@@ -16,7 +16,6 @@ from oslo_config import cfg as openstack_cfg
from oslo_service import service as openstack_service
from trove.cmd.common import with_initialize
-from trove.taskmanager import api as task_api
extra_opts = [openstack_cfg.StrOpt('taskmanager_manager')]
@@ -26,6 +25,7 @@ def startup(conf, topic):
from trove.common import notification
from trove.common.rpc import service as rpc_service
from trove.instance import models as inst_models
+ from trove.taskmanager import api as task_api
notification.DBaaSAPINotification.register_notify_callback(
inst_models.persist_instance_fault)