Allow different login methods to be used with kombu connections

Currently it is not possible to modify the login method used with
kombu connections via configuration files, and requires modifying
the source code to actually add a login method in the first place.
This adds a configuration option (and default) which are passed
along to the kombu connection.

RabbitMQ allows three login method strings by default, but server
side plugins allow arbitrarily named strings to be used as login
methods and as such it is not possible to provide a fixed list of
options to the user.

DocImpact

Change-Id: I5c62a8dd4125d42bb429d3985061e37a9d519fff
Closes-Bug: #1269890
This commit is contained in:
Joe Harrison 2014-01-16 19:06:31 +01:00
parent f81cde600b
commit 98454aaf86
1 changed files with 4 additions and 0 deletions

View File

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