From 59b036a956d06f319033e38a08ef30f44a8794b2 Mon Sep 17 00:00:00 2001 From: Stan Lagun Date: Fri, 13 Sep 2013 17:56:49 +0400 Subject: [PATCH] RabbitMQ SSL parameters were not passed to MqClient for certain types of operations Change-Id: Id497c495bded0cf815ecc96a5ad7a45e7cc337c9 --- muranoapi/db/services/environments.py | 4 +++- muranoapi/db/services/sessions.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/muranoapi/db/services/environments.py b/muranoapi/db/services/environments.py index 172630ecd..dfae1e067 100644 --- a/muranoapi/db/services/environments.py +++ b/muranoapi/db/services/environments.py @@ -129,7 +129,9 @@ class EnvironmentServices(object): 'password': rabbitmq.password, 'host': rabbitmq.host, 'port': rabbitmq.port, - 'virtual_host': rabbitmq.virtual_host + 'virtual_host': rabbitmq.virtual_host, + 'ssl': rabbitmq.ssl, + 'ca_certs': rabbitmq.ca_certs.strip() or None } with MqClient(**connection_params) as mqClient: diff --git a/muranoapi/db/services/sessions.py b/muranoapi/db/services/sessions.py index ffe6a6f91..70469d2de 100644 --- a/muranoapi/db/services/sessions.py +++ b/muranoapi/db/services/sessions.py @@ -143,7 +143,9 @@ class SessionServices(object): 'password': rabbitmq.password, 'host': rabbitmq.host, 'port': rabbitmq.port, - 'virtual_host': rabbitmq.virtual_host + 'virtual_host': rabbitmq.virtual_host, + 'ssl': rabbitmq.ssl, + 'ca_certs': rabbitmq.ca_certs.strip() or None } with MqClient(**connection_params) as mqClient: