diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-02-17 15:22:44 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-02-17 15:44:00 +0000 |
| commit | f63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3 (patch) | |
| tree | fc46499db82de0829e1137b1d620bceb46cb787f /openstack/common/rpc | |
| parent | 8ce59472653439d646309395bf195ec6163ff29a (diff) | |
| download | oslo-f63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3.tar.gz oslo-f63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3.tar.xz oslo-f63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3.zip | |
Use oslo-config-2013.1b3
The cfg API is now available via the oslo-config library, so switch to
it and remove the copied-and-pasted version.
Add the 2013.1b3 tarball to tools/pip-requires - this will be changed
to 'oslo-config>=2013.1' when oslo-config is published to pypi. This
will happen in time for grizzly final.
Remove the 'deps = pep8==1.3.3' and 'deps = pyflakes' from tox.ini as
it means all the other deps get installed with easy_install which can't
install oslo-config from the URL.
Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
Diffstat (limited to 'openstack/common/rpc')
| -rw-r--r-- | openstack/common/rpc/__init__.py | 3 | ||||
| -rw-r--r-- | openstack/common/rpc/common.py | 3 | ||||
| -rw-r--r-- | openstack/common/rpc/impl_kombu.py | 2 | ||||
| -rw-r--r-- | openstack/common/rpc/impl_qpid.py | 2 | ||||
| -rw-r--r-- | openstack/common/rpc/impl_zmq.py | 2 | ||||
| -rw-r--r-- | openstack/common/rpc/matchmaker.py | 3 |
6 files changed, 9 insertions, 6 deletions
diff --git a/openstack/common/rpc/__init__.py b/openstack/common/rpc/__init__.py index a786ae0..b429a83 100644 --- a/openstack/common/rpc/__init__.py +++ b/openstack/common/rpc/__init__.py @@ -28,7 +28,8 @@ For some wrappers that add message versioning to rpc, see: import inspect import logging -from openstack.common import cfg +from oslo.config import cfg + from openstack.common.gettextutils import _ from openstack.common import importutils from openstack.common import local diff --git a/openstack/common/rpc/common.py b/openstack/common/rpc/common.py index 55dad2d..6c52bd8 100644 --- a/openstack/common/rpc/common.py +++ b/openstack/common/rpc/common.py @@ -21,7 +21,8 @@ import copy import sys import traceback -from openstack.common import cfg +from oslo.config import cfg + from openstack.common.gettextutils import _ from openstack.common import importutils from openstack.common import jsonutils diff --git a/openstack/common/rpc/impl_kombu.py b/openstack/common/rpc/impl_kombu.py index 3094678..3f0fa1f 100644 --- a/openstack/common/rpc/impl_kombu.py +++ b/openstack/common/rpc/impl_kombu.py @@ -28,8 +28,8 @@ import kombu import kombu.connection import kombu.entity import kombu.messaging +from oslo.config import cfg -from openstack.common import cfg from openstack.common.gettextutils import _ from openstack.common import network_utils from openstack.common.rpc import amqp as rpc_amqp diff --git a/openstack/common/rpc/impl_qpid.py b/openstack/common/rpc/impl_qpid.py index b3c78bb..6c5cf9b 100644 --- a/openstack/common/rpc/impl_qpid.py +++ b/openstack/common/rpc/impl_qpid.py @@ -22,8 +22,8 @@ import uuid import eventlet import greenlet +from oslo.config import cfg -from openstack.common import cfg from openstack.common.gettextutils import _ from openstack.common import importutils from openstack.common import jsonutils diff --git a/openstack/common/rpc/impl_zmq.py b/openstack/common/rpc/impl_zmq.py index 01114bc..822b1b5 100644 --- a/openstack/common/rpc/impl_zmq.py +++ b/openstack/common/rpc/impl_zmq.py @@ -23,8 +23,8 @@ import uuid import eventlet import greenlet +from oslo.config import cfg -from openstack.common import cfg from openstack.common.gettextutils import _ from openstack.common import importutils from openstack.common import jsonutils diff --git a/openstack/common/rpc/matchmaker.py b/openstack/common/rpc/matchmaker.py index 07190f0..b7e8f3b 100644 --- a/openstack/common/rpc/matchmaker.py +++ b/openstack/common/rpc/matchmaker.py @@ -22,7 +22,8 @@ import contextlib import itertools import json -from openstack.common import cfg +from oslo.config import cfg + from openstack.common.gettextutils import _ from openstack.common import log as logging |