← Back to branch summary

~ceilometer-drivers/ceilometer/trunk

« back to all changes in this revision

Viewing changes to ceilometer/openstack/common/rpc/impl_kombu.py

  • Committer: Angus Salkeld
  • Date: 2012-11-03 00:31:11 UTC
  • Revision ID: git-v1:4c43441d9dafedbc1b73cf8abdec32b1ccb65a71
Update common (except policy)

Change-Id: I17a89a15ff3af5b9f31bf14b1bbe29b024cfc8c1

Show diffs side-by-side

added added

removed removed

Lines of Context:
ceilometer/openstack/common/rpc/impl_kombu.py
31
31
 
32
32
from ceilometer.openstack.common import cfg
33
33
from ceilometer.openstack.common.gettextutils import _
 
34
from ceilometer.openstack.common import network_utils
34
35
from ceilometer.openstack.common.rpc import amqp as rpc_amqp
35
36
from ceilometer.openstack.common.rpc import common as rpc_common
36
 
from ceilometer.openstack.common import network_utils
37
37
 
38
38
kombu_opts = [
39
39
    cfg.StrOpt('kombu_ssl_version',
267
267
 
268
268
        # Default options
269
269
        options = {'durable': False,
 
270
                   'queue_arguments': _get_queue_arguments(conf),
270
271
                   'auto_delete': True,
271
272
                   'exclusive': True}
272
273
        options.update(kwargs)