Fix TaskFlow loader to honor engine configuration

The TaskFlow flow loader was not honoring the TaskFlow engine configured in
the octavia.conf. This patch corrects that behavior so the "parallel" engine
can be used.

Change-Id: I4e9a21f1c58cbf65f4247fe3e2255dc614080bc7
This commit is contained in:
Michael Johnson 2017-11-09 16:33:22 -08:00
parent a05d8aa763
commit 4c11b69685
2 changed files with 2 additions and 2 deletions

View File

@ -36,7 +36,7 @@ class BaseTaskFlowEngine(object):
def _taskflow_load(self, flow, **kwargs): def _taskflow_load(self, flow, **kwargs):
eng = tf_engines.load( eng = tf_engines.load(
flow, flow,
engine_conf=CONF.task_flow.engine, engine=CONF.task_flow.engine,
executor=self.executor, executor=self.executor,
never_resolve=CONF.task_flow.disable_revert, never_resolve=CONF.task_flow.disable_revert,
**kwargs) **kwargs)

View File

@ -60,7 +60,7 @@ class TestBaseTaskFlowEngine(base.TestCase):
tf_engines.load.assert_called_once_with( tf_engines.load.assert_called_once_with(
'TEST', 'TEST',
engine_conf='TESTENGINE', engine='TESTENGINE',
executor='TESTEXECUTOR', executor='TESTEXECUTOR',
never_resolve=True) never_resolve=True)