Permalink
Browse files

Change oslo.* to oslo_*

Change oslo.db to oslo_db
Change oslo.config to olso_config
Change oslo.rootwrap to oslo_rootwrap

The oslo libraries are moving away from namespace packages.

Partial-bug: 1409733

Change-Id: I3429282afa2db4c0b3aa630eb3a0eaece04405ed
  • Loading branch information...
anish committed Feb 3, 2015
1 parent aa1d375 commit cbcda7c7e80e19fd7239f9a835636773a17fbe48
Showing with 7 additions and 7 deletions.
  1. +4 −4 cinder/compute/__init__.py
  2. +2 −2 setup.cfg
  3. +1 −1 tools/config/oslo.config.generator.rc
@@ -13,21 +13,21 @@
# License for the specific language governing permissions and limitations
# under the License.
import oslo.config.cfg
import oslo_config.cfg
from oslo_utils import importutils
_compute_opts = [
oslo.config.cfg.StrOpt('compute_api_class',
oslo_config.cfg.StrOpt('compute_api_class',
default='cinder.compute.nova.API',
help='The full class name of the '
'compute API class to use'),
]
oslo.config.cfg.CONF.register_opts(_compute_opts)
oslo_config.cfg.CONF.register_opts(_compute_opts)
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)
return cls()
@@ -47,7 +47,7 @@ console_scripts =
cinder-api = cinder.cmd.api:main
cinder-backup = cinder.cmd.backup: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-scheduler = cinder.cmd.scheduler: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.database.migration_backend =
sqlalchemy = oslo.db.sqlalchemy.migration
sqlalchemy = oslo_db.sqlalchemy.migration
[build_sphinx]
all_files = 1
@@ -1,2 +1,2 @@
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"

0 comments on commit cbcda7c

Please sign in to comment.