Use oslo-config-2013.1b4

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.1b4 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.

Add dependency_links to setup.py so that oslo-config can be installed
from the tarball URL specified in pip-requires.

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.

Make tools/hacking.py include oslo in IMPORT_EXCEPTIONS like it already
does for paste. It turns out imp.find_module() doesn't correct handle
namespace packages.

Retain dummy cfg.py file until keystoneclient middleware has been
updated (I18c450174277c8e2d15ed93879da6cd92074c27a).

Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
This commit is contained in:
Mark McLoughlin 2013-02-15 22:30:16 +00:00
parent b2d77bcf1d
commit af276eb0b2
14 changed files with 26 additions and 20 deletions

View File

@ -15,8 +15,9 @@
"""Bare-metal DB test base class."""
from oslo.config import cfg
from nova import context as nova_context
from nova.openstack.common import cfg
from nova import test
from nova.virt.baremetal.db import migration as bm_migration
from nova.virt.baremetal.db.sqlalchemy import session as bm_session

View File

@ -20,8 +20,9 @@
"""Tests for the base baremetal driver class."""
from oslo.config import cfg
from nova import exception
from nova.openstack.common import cfg
from nova import test
from nova.tests.baremetal.db import base as bm_db_base
from nova.tests.baremetal.db import utils as bm_db_utils

View File

@ -23,7 +23,8 @@ import os
import stat
import tempfile
from nova.openstack.common import cfg
from oslo.config import cfg
from nova import test
from nova.tests.baremetal.db import utils as bm_db_utils
from nova import utils

View File

@ -21,10 +21,10 @@
import os
from oslo.config import cfg
from testtools import matchers
from nova import exception
from nova.openstack.common import cfg
from nova.openstack.common.db.sqlalchemy import session as db_session
from nova.tests.baremetal.db import base as bm_db_base
from nova.tests.baremetal.db import utils as bm_db_utils

View File

@ -19,16 +19,14 @@
"""Tests for baremetal virtual power driver."""
import mox
from oslo.config import cfg
from nova import exception
from nova.openstack.common import cfg
from nova import utils as nutils
from nova.tests.baremetal.db import base as bm_db_base
from nova.tests.baremetal.db import utils as bm_db_utils
from nova.tests.image import fake as fake_image
from nova.tests import utils
from nova import utils as nutils
from nova.virt.baremetal import db
from nova.virt.baremetal import virtual_power_driver
import nova.virt.powervm.common as connection

View File

@ -15,9 +15,9 @@
"""Tests for baremetal volume driver."""
from nova.openstack.common import cfg
from nova import test
from oslo.config import cfg
from nova import test
from nova.virt.baremetal import volume_driver
CONF = cfg.CONF

View File

@ -42,9 +42,9 @@ these objects be simple dictionaries.
"""
from nova.openstack.common import cfg
from nova import utils
from oslo.config import cfg
from nova import utils
# NOTE(deva): we can't move baremetal_db_backend into an OptGroup yet
# because utils.LazyPluggable doesn't support reading from

View File

@ -19,7 +19,8 @@
"""Session Handling for SQLAlchemy backend."""
from nova.openstack.common import cfg
from oslo.config import cfg
from nova.openstack.common.db.sqlalchemy import session as nova_session
from nova import paths

View File

@ -21,10 +21,11 @@
A driver for Bare-metal platform.
"""
from oslo.config import cfg
from nova.compute import power_state
from nova import context as nova_context
from nova import exception
from nova.openstack.common import cfg
from nova.openstack.common.db.sqlalchemy import session as db_session
from nova.openstack.common import importutils
from nova.openstack.common import log as logging

View File

@ -25,8 +25,9 @@ import os
import stat
import tempfile
from oslo.config import cfg
from nova import exception
from nova.openstack.common import cfg
from nova.openstack.common import log as logging
from nova import paths
from nova import utils

View File

@ -22,9 +22,10 @@ Class for PXE bare-metal nodes.
import os
from oslo.config import cfg
from nova.compute import instance_types
from nova import exception
from nova.openstack.common import cfg
from nova.openstack.common.db.sqlalchemy import session as db_session
from nova.openstack.common import fileutils
from nova.openstack.common import log as logging
@ -32,7 +33,6 @@ from nova.virt.baremetal import base
from nova.virt.baremetal import db
from nova.virt.baremetal import utils as bm_utils
pxe_opts = [
cfg.StrOpt('deploy_kernel',
help='Default kernel image ID used in deployment phase'),

View File

@ -13,9 +13,10 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from nova import context
from nova import exception
from nova.openstack.common import cfg
from nova.openstack.common import log as logging
from nova.virt.baremetal import db as bmdb

View File

@ -17,9 +17,9 @@
#
# Virtual power driver
from oslo.config import cfg
from nova import exception
from nova.openstack.common import cfg
from nova.openstack.common import importutils
from nova.openstack.common import log as logging
from nova import utils

View File

@ -18,9 +18,10 @@
import re
from oslo.config import cfg
from nova import context as nova_context
from nova import exception
from nova.openstack.common import cfg
from nova.openstack.common import importutils
from nova.openstack.common import log as logging
from nova import utils