openstack/oslo.messaging
Code Issues Proposed changes

Merge "Allow different login methods to be used with kombu connections"

Browse Source
This commit is contained in:
Jenkins 2014-02-10 03:15:10 +00:00 committed by Gerrit Code Review
commit 44d38cb15c
1 changed files with 4 additions and 0 deletions

4
oslo/messaging/_drivers/impl_rabbit.py

@ -72,6 +72,9 @@ rabbit_opts = [
default='guest', default='guest',
help='The RabbitMQ password', help='The RabbitMQ password',
secret=True), secret=True),
cfg.StrOpt('rabbit_login_method',
default='AMQPLAIN',
help='the RabbitMQ login method'),
cfg.StrOpt('rabbit_virtual_host', cfg.StrOpt('rabbit_virtual_host',
default='/', default='/',
help='The RabbitMQ virtual host'), help='The RabbitMQ virtual host'),
@ -432,6 +435,7 @@ class Connection(object):
'port': port, 'port': port,
'userid': self.conf.rabbit_userid, 'userid': self.conf.rabbit_userid,
'password': self.conf.rabbit_password, 'password': self.conf.rabbit_password,
'login_method': self.conf.rabbit_login_method,
'virtual_host': self.conf.rabbit_virtual_host, 'virtual_host': self.conf.rabbit_virtual_host,
} }