stackforge-attic/murano-conductor
Code Issues Proposed changes

Rename RabbitMQ username field

Browse Source 
Removed use_ssl option from settings
This commit is contained in:
Serg Melikyan 2013-03-29 18:48:06 +04:00
parent 15dcf450ee
commit a6a485b635
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
portas/etc/portas-api.conf
View File

@ -27,7 +27,6 @@ reports_queue = task-reports
[rabbitmq] [rabbitmq]
host = localhost host = localhost
port = 5672 port = 5672
use_ssl = false
userid = keero
password = keero
virtual_host = keero virtual_host = keero
login = keero
password = keero

2
portas/portas/api/v1/environments.py
View File

@ -101,7 +101,7 @@ class Controller(object):
connection = amqp.Connection('{0}:{1}'. connection = amqp.Connection('{0}:{1}'.
format(rabbitmq.host, rabbitmq.port), format(rabbitmq.host, rabbitmq.port),
virtual_host=rabbitmq.virtual_host, virtual_host=rabbitmq.virtual_host,
userid=rabbitmq.userid, userid=rabbitmq.login,
password=rabbitmq.password, password=rabbitmq.password,
ssl=rabbitmq.use_ssl, insist=True) ssl=rabbitmq.use_ssl, insist=True)
channel = connection.channel() channel = connection.channel()

2
portas/portas/api/v1/sessions.py
View File

@ -139,7 +139,7 @@ class Controller(object):
connection = amqp.Connection('{0}:{1}'. connection = amqp.Connection('{0}:{1}'.
format(rabbitmq.host, rabbitmq.port), format(rabbitmq.host, rabbitmq.port),
virtual_host=rabbitmq.virtual_host, virtual_host=rabbitmq.virtual_host,
userid=rabbitmq.userid, userid=rabbitmq.login,
password=rabbitmq.password, password=rabbitmq.password,
ssl=rabbitmq.use_ssl, insist=True) ssl=rabbitmq.use_ssl, insist=True)
channel = connection.channel() channel = connection.channel()

2
portas/portas/common/config.py
View File

@ -52,7 +52,7 @@ rabbit_opts = [
cfg.StrOpt('host', default='localhost'), cfg.StrOpt('host', default='localhost'),
cfg.IntOpt('port', default=5672), cfg.IntOpt('port', default=5672),
cfg.BoolOpt('use_ssl', default=False), cfg.BoolOpt('use_ssl', default=False),
cfg.StrOpt('userid', default='guest'), cfg.StrOpt('login', default='guest'),
cfg.StrOpt('password', default='guest'), cfg.StrOpt('password', default='guest'),
cfg.StrOpt('virtual_host', default='/'), cfg.StrOpt('virtual_host', default='/'),
] ]

2
portas/portas/common/service.py
View File

@ -30,7 +30,7 @@ class TaskResultHandlerService(service.Service):
connection = amqp.Connection('{0}:{1}'. connection = amqp.Connection('{0}:{1}'.
format(rabbitmq.host, rabbitmq.port), format(rabbitmq.host, rabbitmq.port),
virtual_host=rabbitmq.virtual_host, virtual_host=rabbitmq.virtual_host,
userid=rabbitmq.userid, userid=rabbitmq.login,
password=rabbitmq.password, password=rabbitmq.password,
ssl=rabbitmq.use_ssl, insist=True) ssl=rabbitmq.use_ssl, insist=True)
ch = connection.channel() ch = connection.channel()