From 4c11b696850a0790193f1473df82ea0e7e53507f Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Thu, 9 Nov 2017 16:33:22 -0800 Subject: [PATCH] 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 --- octavia/common/base_taskflow.py | 2 +- octavia/tests/unit/common/test_base_taskflow.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/octavia/common/base_taskflow.py b/octavia/common/base_taskflow.py index c102e0aba5..a0abf4ee18 100644 --- a/octavia/common/base_taskflow.py +++ b/octavia/common/base_taskflow.py @@ -36,7 +36,7 @@ class BaseTaskFlowEngine(object): def _taskflow_load(self, flow, **kwargs): eng = tf_engines.load( flow, - engine_conf=CONF.task_flow.engine, + engine=CONF.task_flow.engine, executor=self.executor, never_resolve=CONF.task_flow.disable_revert, **kwargs) diff --git a/octavia/tests/unit/common/test_base_taskflow.py b/octavia/tests/unit/common/test_base_taskflow.py index e1ef3918bc..04da83e164 100644 --- a/octavia/tests/unit/common/test_base_taskflow.py +++ b/octavia/tests/unit/common/test_base_taskflow.py @@ -60,7 +60,7 @@ class TestBaseTaskFlowEngine(base.TestCase): tf_engines.load.assert_called_once_with( 'TEST', - engine_conf='TESTENGINE', + engine='TESTENGINE', executor='TESTEXECUTOR', never_resolve=True)