summaryrefslogtreecommitdiff
path: root/trove/cmd/conductor.py
diff options
context:
space:
mode:
authorboden <boden@linux.vnet.ibm.com>2014-06-25 09:19:09 -0400
committerboden <boden@linux.vnet.ibm.com>2014-06-27 04:15:46 -0400
commit87f0229e87620be5a7462fb221d97c7713278d58 (patch)
tree15559816702b69ac62e130a4b407a42ade561d7b /trove/cmd/conductor.py
parent0a6de4300ebf6e2ae4582a6341164a1b0323ceed (diff)
downloadtrove-87f0229e87620be5a7462fb221d97c7713278d58.tar.gz
Expose trove conductor manager class as conf property
The current implementation of trove conductor hard-codes the conductor manager class name in the cmd entry point thus not allowing it to be set by consumers. This change exposes that classname on the conductor conf so that consumers could plug-in their own manager class. Additionally unit tests are provided to ensure a user defined and conductor manager can be used in addition to the default trove conductor manager. Change-Id: I6bf88dd9cf119f0eb6a197f4bda48c309511297e Implements: blueprint pluggable-conductor-manager
Diffstat (limited to 'trove/cmd/conductor.py')
-rwxr-xr-xtrove/cmd/conductor.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/trove/cmd/conductor.py b/trove/cmd/conductor.py
index 14f8db1f..0508e51b 100755
--- a/trove/cmd/conductor.py
+++ b/trove/cmd/conductor.py
@@ -20,9 +20,9 @@ def main(conf):
from trove.common.rpc import service as rpc_service
from trove.openstack.common import service as openstack_service
- manager = 'trove.conductor.manager.Manager'
topic = conf.conductor_queue
- server = rpc_service.RpcService(manager=manager, topic=topic)
+ server = rpc_service.RpcService(manager=conf.conductor_manager,
+ topic=topic)
launcher = openstack_service.launch(server,
workers=conf.trove_conductor_workers)
launcher.wait()