From 5735d5a01bcd27f2058ff2a7534cac77c3245c6b Mon Sep 17 00:00:00 2001 From: Tatsuma Matsuki Date: Mon, 20 Jan 2020 11:55:26 +0900 Subject: [PATCH] Fix the amqp connection for WorkflowExecutionHandler to pass the SSL params. To pass the SSL params, get_connection() should be used instead. Related commit: dd4465a266c11e2dfd2fcf97896562ff8a9e8605 --- CHANGELOG.rst | 3 +++ st2actions/st2actions/workflows/workflows.py | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5e0deda0fb..41177e391b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -105,6 +105,9 @@ Fixed NOTE: This issue only affected installations using Python 3. (bug fix) #4832 #4834 Reported by @alexku7. +* Fix the amqp connection setup for WorkflowExecutionHandler to pass SSL params. (bug fix) #4845 + + Contributed by Tatsuma Matsuki (@mtatsuma) 3.1.0 - June 27, 2019 --------------------- diff --git a/st2actions/st2actions/workflows/workflows.py b/st2actions/st2actions/workflows/workflows.py index 2a26b18ecc..397cf2d49b 100644 --- a/st2actions/st2actions/workflows/workflows.py +++ b/st2actions/st2actions/workflows/workflows.py @@ -14,8 +14,6 @@ from __future__ import absolute_import -import kombu - from orquesta import statuses from st2common.constants import action as ac_const @@ -179,5 +177,5 @@ def handle_action_execution(self, ac_ex_db): def get_engine(): - with kombu.Connection(txpt_utils.get_messaging_urls()) as conn: + with txpt_utils.get_connection() as conn: return WorkflowExecutionHandler(conn, WORKFLOW_EXECUTION_QUEUES)