diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-02-15 22:30:16 +0000 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2013-02-19 21:16:32 -0800 |
| commit | 706a1370056ffccc2c8811fc1ac0679944564ece (patch) | |
| tree | 0b71139bbf282e7909b0df37a69a2aaa8f3e32d2 /nova/volume | |
| parent | d62205f316ad9490e1379e943972a007e071c688 (diff) | |
| download | nova-706a1370056ffccc2c8811fc1ac0679944564ece.tar.gz nova-706a1370056ffccc2c8811fc1ac0679944564ece.tar.xz nova-706a1370056ffccc2c8811fc1ac0679944564ece.zip | |
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
Diffstat (limited to 'nova/volume')
| -rw-r--r-- | nova/volume/__init__.py | 9 | ||||
| -rw-r--r-- | nova/volume/cinder.py | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/nova/volume/__init__.py b/nova/volume/__init__.py index da54a5009..1a1917307 100644 --- a/nova/volume/__init__.py +++ b/nova/volume/__init__.py @@ -16,23 +16,24 @@ # License for the specific language governing permissions and limitations # under the License. +import oslo.config.cfg + # Importing full names to not pollute the namespace and cause possible # collisions with use of 'from nova.volume import <foo>' elsewhere. -import nova.openstack.common.cfg import nova.openstack.common.importutils _volume_opts = [ - nova.openstack.common.cfg.StrOpt('volume_api_class', + oslo.config.cfg.StrOpt('volume_api_class', default='nova.volume.cinder.API', help='The full class name of the ' 'volume API class to use'), ] -nova.openstack.common.cfg.CONF.register_opts(_volume_opts) +oslo.config.cfg.CONF.register_opts(_volume_opts) def API(): importutils = nova.openstack.common.importutils - volume_api_class = nova.openstack.common.cfg.CONF.volume_api_class + volume_api_class = oslo.config.cfg.CONF.volume_api_class cls = importutils.import_class(volume_api_class) return cls() diff --git a/nova/volume/cinder.py b/nova/volume/cinder.py index b58e63011..e465daf1c 100644 --- a/nova/volume/cinder.py +++ b/nova/volume/cinder.py @@ -26,10 +26,10 @@ import sys from cinderclient import exceptions as cinder_exception from cinderclient import service_catalog from cinderclient.v1 import client as cinder_client +from oslo.config import cfg from nova.db import base from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import log as logging cinder_opts = [ |