Use oslo.config-1.1.0b1
The cfg API is now available via the oslo-config library, so switch to
it and remove the copied-and-pasted version.
Add the oslo.config-1.1.0b1 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' 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: Ie803935d5f1b4fb88e76932cc42ce22b45acffad
diff --git a/cli/__init__.py b/cli/__init__.py
index e97fe3e..2548f24 100644
--- a/cli/__init__.py
+++ b/cli/__init__.py
@@ -19,9 +19,11 @@
import shlex
import subprocess
-from tempest.openstack.common import cfg
+from oslo.config import cfg
+
import tempest.test
+
LOG = logging.getLogger(__name__)
cli_opts = [
diff --git a/cli/simple_read_only/test_compute.py b/cli/simple_read_only/test_compute.py
index 849ed6f..bcdd2c5 100644
--- a/cli/simple_read_only/test_compute.py
+++ b/cli/simple_read_only/test_compute.py
@@ -18,11 +18,11 @@
import logging
import subprocess
+from oslo.config import cfg
import testtools
import cli
-
-from tempest.openstack.common import cfg
+from tempest import config
CONF = cfg.CONF