diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-25 14:53:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-25 14:53:57 +0000 |
| commit | adc2253fc9adffe9fe8f134432ec19c6c85588a7 (patch) | |
| tree | 53a3f9bb3faaa9109708bf5a182abe420e6b3b8e /openstack/common/rpc/impl_kombu.py | |
| parent | 411f7f0999e907193012f2afec9c05aaf9b31981 (diff) | |
| parent | 72e5f4783a74075d9bebdf5f04e44fde7dd170cb (diff) | |
| download | oslo-adc2253fc9adffe9fe8f134432ec19c6c85588a7.tar.gz oslo-adc2253fc9adffe9fe8f134432ec19c6c85588a7.tar.xz oslo-adc2253fc9adffe9fe8f134432ec19c6c85588a7.zip | |
Merge "Don't deprecate rabbit_host and rabbit_port"
Diffstat (limited to 'openstack/common/rpc/impl_kombu.py')
| -rw-r--r-- | openstack/common/rpc/impl_kombu.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/openstack/common/rpc/impl_kombu.py b/openstack/common/rpc/impl_kombu.py index dda31d9..22dc031 100644 --- a/openstack/common/rpc/impl_kombu.py +++ b/openstack/common/rpc/impl_kombu.py @@ -51,10 +51,10 @@ kombu_opts = [ '(valid only if SSL enabled)')), cfg.StrOpt('rabbit_host', default='localhost', - help='Deprecated: Use rabbit_hosts instead. The RabbitMQ host'), + help='The RabbitMQ broker address where a single node is used'), cfg.IntOpt('rabbit_port', default=5672, - help='Deprecated: Use rabbit_hosts instead. The RabbitMQ port'), + help='The RabbitMQ broker port where a single node is used'), cfg.ListOpt('rabbit_hosts', default=['$rabbit_host:$rabbit_port'], help='RabbitMQ HA cluster host:port pairs'), @@ -405,7 +405,8 @@ class Connection(object): ssl_params = self._fetch_ssl_params() params_list = [] for adr in self.conf.rabbit_hosts: - hostname, port = utils.parse_host_port(adr, default_port=5672) + hostname, port = utils.parse_host_port( + adr, default_port=self.conf.rabbit_port) params = {} |