From 494bcc52116b0f56e32bc77c1d5f302fc6cda26e Mon Sep 17 00:00:00 2001 From: Serg Melikyan Date: Fri, 22 Nov 2013 18:04:27 +0400 Subject: [PATCH] Enable HA on declared queues Change-Id: I57a7ca13580a507f7a51c0ec7078f7f2eaef185e --- muranoapi/common/service.py | 6 ++++-- muranoapi/db/services/environments.py | 2 +- muranoapi/db/services/sessions.py | 2 +- requirements.txt | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/muranoapi/common/service.py b/muranoapi/common/service.py index 29490b85..db1c4411 100644 --- a/muranoapi/common/service.py +++ b/muranoapi/common/service.py @@ -55,7 +55,8 @@ class TaskResultHandlerService(service.Service): while True: try: with self._create_mq_client() as mqClient: - mqClient.declare(conf.results_exchange, conf.results_queue) + mqClient.declare(conf.results_exchange, conf.results_queue, + enable_ha=True) with mqClient.open(conf.results_queue, prefetch_count=100) as results_sb: while True: @@ -69,7 +70,8 @@ class TaskResultHandlerService(service.Service): while True: try: with self._create_mq_client() as mqClient: - mqClient.declare(conf.reports_exchange, conf.reports_queue) + mqClient.declare(conf.reports_exchange, conf.reports_queue, + enable_ha=True) with mqClient.open(conf.reports_queue, prefetch_count=100) as reports_sb: while True: diff --git a/muranoapi/db/services/environments.py b/muranoapi/db/services/environments.py index 936c972a..c841d99f 100644 --- a/muranoapi/db/services/environments.py +++ b/muranoapi/db/services/environments.py @@ -132,7 +132,7 @@ class EnvironmentServices(object): } with MqClient(**connection_params) as mqClient: - mqClient.declare('tasks', 'tasks') + mqClient.declare('tasks', 'tasks', enable_ha=True) mqClient.send(message, 'tasks', 'tasks') with unit.begin(): diff --git a/muranoapi/db/services/sessions.py b/muranoapi/db/services/sessions.py index 70469d2d..5a2f58e9 100644 --- a/muranoapi/db/services/sessions.py +++ b/muranoapi/db/services/sessions.py @@ -149,5 +149,5 @@ class SessionServices(object): } with MqClient(**connection_params) as mqClient: - mqClient.declare('tasks', 'tasks') + mqClient.declare('tasks', 'tasks', enable_ha=True) mqClient.send(message, 'tasks', 'tasks') diff --git a/requirements.txt b/requirements.txt index 6ec43426..92fce71a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,4 +30,5 @@ passlib jsonschema>=1.3.0,!=1.4.0 python-keystoneclient>=0.4.1 oslo.config>=1.2.0 -murano-common>=0.2.2 +# Please, revert to murano-common>=x.x.x before release +http://tarballs.openstack.org/murano-common/murano-common-master.tar.gz#egg=murano-common-0.4