diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-18 15:33:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-18 15:33:49 +0000 |
| commit | f5ca941543847e62426cf1166a68053d711d4e32 (patch) | |
| tree | 88f4e95725d1e79d12efc48ec7f94938f5d214ba /openstack/common/rpc/__init__.py | |
| parent | 9f938720f158889252fa1db44be96745fa48e1ff (diff) | |
| parent | 91fc479399ab12d8ba670c3627582ebfc3950af8 (diff) | |
| download | oslo-f5ca941543847e62426cf1166a68053d711d4e32.tar.gz oslo-f5ca941543847e62426cf1166a68053d711d4e32.tar.xz oslo-f5ca941543847e62426cf1166a68053d711d4e32.zip | |
Merge "rpc: Update rpc_backend handling."
Diffstat (limited to 'openstack/common/rpc/__init__.py')
| -rw-r--r-- | openstack/common/rpc/__init__.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/openstack/common/rpc/__init__.py b/openstack/common/rpc/__init__.py index dc4b185..95b4dce 100644 --- a/openstack/common/rpc/__init__.py +++ b/openstack/common/rpc/__init__.py @@ -31,7 +31,7 @@ from openstack.common import importutils rpc_opts = [ cfg.StrOpt('rpc_backend', - default='nova.rpc.impl_kombu', + default='%s.impl_kombu' % __package__, help="The messaging module to use, defaults to kombu."), cfg.IntOpt('rpc_thread_pool_size', default=64, @@ -248,5 +248,11 @@ def _get_impl(): """Delay import of rpc_backend until configuration is loaded.""" global _RPCIMPL if _RPCIMPL is None: - _RPCIMPL = importutils.import_module(cfg.CONF.rpc_backend) + try: + _RPCIMPL = importutils.import_module(cfg.CONF.rpc_backend) + except ImportError: + # For backwards compatibility with older nova config. + impl = cfg.CONF.rpc_backend.replace('nova.rpc', + 'nova.openstack.common.rpc') + _RPCIMPL = importutils.import_module(impl) return _RPCIMPL |