openstack/cinder
Code Issues Proposed changes

Merge "Fix oslo.config.cfg.NoSuchOptError when running individual tests"

Browse Source
This commit is contained in:
Jenkins 2013-07-31 14:15:58 +00:00 committed by Gerrit Code Review
commit 5166842a13
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/backup/__init__.py
View File

@ -17,11 +17,10 @@
# collisions with use of 'from cinder.backup import <foo>' elsewhere.
from oslo.config import cfg
from cinder.common import config
import cinder.openstack.common.importutils
CONF = cfg.CONF
CONF = config.CONF
API = cinder.openstack.common.importutils.import_class(CONF.backup_api_class)

5
cinder/volume/__init__.py
View File

@ -20,11 +20,10 @@
# collisions with use of 'from cinder.volume import <foo>' elsewhere.
from oslo.config import cfg
from cinder.common import config
import cinder.openstack.common.importutils as import_utils
CONF = cfg.CONF
CONF = config.CONF
API = import_utils.import_class(CONF.volume_api_class)