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/notifier | |
| 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/notifier')
| -rw-r--r-- | openstack/common/notifier/api.py | 3 | ||||
| -rw-r--r-- | openstack/common/notifier/log_notifier.py | 2 | ||||
| -rw-r--r-- | openstack/common/notifier/rpc_notifier.py | 2 | ||||
| -rw-r--r-- | openstack/common/notifier/rpc_notifier2.py | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/openstack/common/notifier/api.py b/openstack/common/notifier/api.py index 5714306..1ca1054 100644 --- a/openstack/common/notifier/api.py +++ b/openstack/common/notifier/api.py @@ -15,7 +15,8 @@ import uuid -from openstack.common import cfg +from oslo.config import cfg + from openstack.common import context from openstack.common.gettextutils import _ from openstack.common import importutils diff --git a/openstack/common/notifier/log_notifier.py b/openstack/common/notifier/log_notifier.py index b333d7a..e947fa2 100644 --- a/openstack/common/notifier/log_notifier.py +++ b/openstack/common/notifier/log_notifier.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg -from openstack.common import cfg from openstack.common import jsonutils from openstack.common import log as logging diff --git a/openstack/common/notifier/rpc_notifier.py b/openstack/common/notifier/rpc_notifier.py index 7e25f47..a87a560 100644 --- a/openstack/common/notifier/rpc_notifier.py +++ b/openstack/common/notifier/rpc_notifier.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg -from openstack.common import cfg from openstack.common import context as req_context from openstack.common.gettextutils import _ from openstack.common import log as logging diff --git a/openstack/common/notifier/rpc_notifier2.py b/openstack/common/notifier/rpc_notifier2.py index b7696fd..f454723 100644 --- a/openstack/common/notifier/rpc_notifier2.py +++ b/openstack/common/notifier/rpc_notifier2.py @@ -15,7 +15,8 @@ '''messaging based notification driver, with message envelopes''' -from openstack.common import cfg +from oslo.config import cfg + from openstack.common import context as req_context from openstack.common.gettextutils import _ from openstack.common import log as logging |