From a6a485b635b63de3c624dceffca283f8d32dfd64 Mon Sep 17 00:00:00 2001 From: Serg Melikyan Date: Fri, 29 Mar 2013 18:48:06 +0400 Subject: [PATCH] Rename RabbitMQ username field Removed use_ssl option from settings --- portas/etc/portas-api.conf | 5 ++--- portas/portas/api/v1/environments.py | 2 +- portas/portas/api/v1/sessions.py | 2 +- portas/portas/common/config.py | 2 +- portas/portas/common/service.py | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/portas/etc/portas-api.conf b/portas/etc/portas-api.conf index be932a26..a292b82e 100644 --- a/portas/etc/portas-api.conf +++ b/portas/etc/portas-api.conf @@ -27,7 +27,6 @@ reports_queue = task-reports [rabbitmq] host = localhost port = 5672 -use_ssl = false -userid = keero -password = keero virtual_host = keero +login = keero +password = keero diff --git a/portas/portas/api/v1/environments.py b/portas/portas/api/v1/environments.py index 3c7f83c2..2473d4dd 100644 --- a/portas/portas/api/v1/environments.py +++ b/portas/portas/api/v1/environments.py @@ -101,7 +101,7 @@ class Controller(object): connection = amqp.Connection('{0}:{1}'. format(rabbitmq.host, rabbitmq.port), virtual_host=rabbitmq.virtual_host, - userid=rabbitmq.userid, + userid=rabbitmq.login, password=rabbitmq.password, ssl=rabbitmq.use_ssl, insist=True) channel = connection.channel() diff --git a/portas/portas/api/v1/sessions.py b/portas/portas/api/v1/sessions.py index 90b58b89..8d533c2e 100644 --- a/portas/portas/api/v1/sessions.py +++ b/portas/portas/api/v1/sessions.py @@ -139,7 +139,7 @@ class Controller(object): connection = amqp.Connection('{0}:{1}'. format(rabbitmq.host, rabbitmq.port), virtual_host=rabbitmq.virtual_host, - userid=rabbitmq.userid, + userid=rabbitmq.login, password=rabbitmq.password, ssl=rabbitmq.use_ssl, insist=True) channel = connection.channel() diff --git a/portas/portas/common/config.py b/portas/portas/common/config.py index 58a6378a..a04dcafe 100644 --- a/portas/portas/common/config.py +++ b/portas/portas/common/config.py @@ -52,7 +52,7 @@ rabbit_opts = [ cfg.StrOpt('host', default='localhost'), cfg.IntOpt('port', default=5672), cfg.BoolOpt('use_ssl', default=False), - cfg.StrOpt('userid', default='guest'), + cfg.StrOpt('login', default='guest'), cfg.StrOpt('password', default='guest'), cfg.StrOpt('virtual_host', default='/'), ] diff --git a/portas/portas/common/service.py b/portas/portas/common/service.py index 744a3423..634f1edb 100644 --- a/portas/portas/common/service.py +++ b/portas/portas/common/service.py @@ -30,7 +30,7 @@ class TaskResultHandlerService(service.Service): connection = amqp.Connection('{0}:{1}'. format(rabbitmq.host, rabbitmq.port), virtual_host=rabbitmq.virtual_host, - userid=rabbitmq.userid, + userid=rabbitmq.login, password=rabbitmq.password, ssl=rabbitmq.use_ssl, insist=True) ch = connection.channel()