openstack/cinder
Code Issues Proposed changes

Merge "Change oslo.* to oslo_*"

Browse Source
This commit is contained in:
Jenkins 2015-02-05 12:30:28 +00:00 committed by Gerrit Code Review
commit b87af0c330
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/compute/__init__.py
View File

@ -13,21 +13,21 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import oslo.config.cfg import oslo_config.cfg
from oslo_utils import importutils from oslo_utils import importutils
_compute_opts = [ _compute_opts = [
oslo.config.cfg.StrOpt('compute_api_class', oslo_config.cfg.StrOpt('compute_api_class',
default='cinder.compute.nova.API', default='cinder.compute.nova.API',
help='The full class name of the ' help='The full class name of the '
'compute API class to use'), 'compute API class to use'),
] ]
oslo.config.cfg.CONF.register_opts(_compute_opts) oslo_config.cfg.CONF.register_opts(_compute_opts)
def API(): def API():
compute_api_class = oslo.config.cfg.CONF.compute_api_class compute_api_class = oslo_config.cfg.CONF.compute_api_class
cls = importutils.import_class(compute_api_class) cls = importutils.import_class(compute_api_class)
return cls() return cls()

4
setup.cfg
View File

@ -47,7 +47,7 @@ console_scripts =
cinder-api = cinder.cmd.api:main cinder-api = cinder.cmd.api:main
cinder-backup = cinder.cmd.backup:main cinder-backup = cinder.cmd.backup:main
cinder-manage = cinder.cmd.manage:main cinder-manage = cinder.cmd.manage:main
cinder-rootwrap = oslo.rootwrap.cmd:main cinder-rootwrap = oslo_rootwrap.cmd:main
cinder-rtstool = cinder.cmd.rtstool:main cinder-rtstool = cinder.cmd.rtstool:main
cinder-scheduler = cinder.cmd.scheduler:main cinder-scheduler = cinder.cmd.scheduler:main
cinder-volume = cinder.cmd.volume:main cinder-volume = cinder.cmd.volume:main
@ -61,7 +61,7 @@ oslo.messaging.notify.drivers =
cinder.openstack.common.notifier.test_notifier = oslo.messaging.notify._impl_test:TestDriver cinder.openstack.common.notifier.test_notifier = oslo.messaging.notify._impl_test:TestDriver
cinder.database.migration_backend = cinder.database.migration_backend =
sqlalchemy = oslo.db.sqlalchemy.migration sqlalchemy = oslo_db.sqlalchemy.migration
[build_sphinx] [build_sphinx]
all_files = 1 all_files = 1

2
tools/config/oslo.config.generator.rc
View File

@ -1,2 +1,2 @@
export CINDER_CONFIG_GENERATOR_EXTRA_MODULES="keystonemiddleware.auth_token" export CINDER_CONFIG_GENERATOR_EXTRA_MODULES="keystonemiddleware.auth_token"
export CINDER_CONFIG_GENERATOR_EXTRA_LIBRARIES="oslo.messaging oslo.db oslo.db.concurrency" export CINDER_CONFIG_GENERATOR_EXTRA_LIBRARIES="oslo.messaging oslo_db oslo.db.concurrency"