openstack
/
octavia
Code Issues Proposed changes

Merge "Fix TaskFlow loader to honor engine configuration"

This commit is contained in:
Zuul 2017-11-21 02:38:35 +00:00 committed by Gerrit Code Review
parent 853f3965ca 4c11b69685
commit 81a47d9d8c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octavia/common/base_taskflow.py
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)

2
octavia/tests/unit/common/test_base_taskflow.py
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)