openstack
/
glance
Code Issues Proposed changes

Remove usage of parameter enforce_type 

Oslo.config deprecated parameter enforce_type and change its
default value to True in Ifa552de0a994e40388cbc9f7dbaa55700ca276b0.
Remove the usage of it to avoid DeprecationWarning: "Using the
'enforce_type' argument is deprecated in version '4.0' and will be
removed in version '5.0': The argument enforce_type has changed its
default value to True and then will be removed completely."

Change-Id: If045d76574823f29c58b39a104354abc1407cb8d
Related--Bug: #1517839
This commit is contained in:
ChangBo Guo(gcb) 2017-05-04 13:17:46 +08:00
parent e4790e5067
commit e78ab76fa1
10 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glance/async/flows/api_image_import.py
View File

@ -101,8 +101,7 @@ class _VerifyStaging(task.Task):
backend.register_opts(conf)
conf.set_override('filesystem_store_datadir',
CONF.node_staging_uri[7:],
group='glance_store',
enforce_type=True)
group='glance_store')
# NOTE(flaper87): Do not even try to judge me for this... :(
# With the glance_store refactor, this code will change, until

3
glance/async/flows/base_import.py
View File

@ -115,8 +115,7 @@ class _ImportToFS(task.Task):
backend.register_opts(conf)
conf.set_override('filesystem_store_datadir',
CONF.task.work_dir,
group='glance_store',
enforce_type=True)
group='glance_store')
# NOTE(flaper87): Do not even try to judge me for this... :(
# With the glance_store refactor, this code will change, until

2
glance/cmd/cache_cleaner.py
View File

@ -47,7 +47,7 @@ from glance.image_cache import cleaner
CONF = config.CONF
logging.register_options(CONF)
CONF.set_default(name='use_stderr', default=True, enforce_type=True)
CONF.set_default(name='use_stderr', default=True)
def main():

2
glance/cmd/cache_prefetcher.py
View File

@ -41,7 +41,7 @@ from glance.image_cache import prefetcher
CONF = config.CONF
logging.register_options(CONF)
CONF.set_default(name='use_stderr', default=True, enforce_type=True)
CONF.set_default(name='use_stderr', default=True)
def main():

2
glance/cmd/cache_pruner.py
View File

@ -39,7 +39,7 @@ from glance.image_cache import pruner
CONF = config.CONF
logging.register_options(CONF)
CONF.set_default(name='use_stderr', default=True, enforce_type=True)
CONF.set_default(name='use_stderr', default=True)
def main():

2
glance/cmd/manage.py
View File

@ -434,7 +434,7 @@ def main():
try:
logging.register_options(CONF)
CONF.set_default(name='use_stderr', default=True, enforce_type=True)
CONF.set_default(name='use_stderr', default=True)
cfg_files = cfg.find_config_files(project='glance',
prog='glance-registry')
cfg_files.extend(cfg.find_config_files(project='glance',

2
glance/cmd/replicator.py
View File

@ -100,7 +100,7 @@ CONF.register_opt(
"one. This is the token used for the target.")))
logging.register_options(CONF)
CONF.set_default(name='use_stderr', default=True, enforce_type=True)
CONF.set_default(name='use_stderr', default=True)
# If ../glance/__init__.py exists, add ../ to Python search path, so that
# it will override what happens to be installed in /usr/(local/)lib/python...

2
glance/cmd/scrubber.py
View File

@ -43,7 +43,7 @@ eventlet.patcher.monkey_patch(all=False, socket=True, time=True, select=True,
CONF = cfg.CONF
logging.register_options(CONF)
CONF.set_default(name='use_stderr', default=True, enforce_type=True)
CONF.set_default(name='use_stderr', default=True)
def main():

5
glance/tests/functional/db/test_simple.py
View File

@ -21,9 +21,8 @@ from glance.tests.functional.db import base
def get_db(config, workers=1):
CONF.set_override('data_api', 'glance.db.simple.api',
enforce_type=True)
CONF.set_override('workers', workers, enforce_type=True)
CONF.set_override('data_api', 'glance.db.simple.api')
CONF.set_override('workers', workers)
db_api = glance.db.get_api()
return db_api

3
glance/tests/integration/v2/test_property_quota_violations.py
View File

@ -71,8 +71,7 @@ class TestPropertyQuotaViolations(base.ApiTest):
self.assertEqual(0, len(image_list))
orig_property_quota = 10
CONF.set_override('image_property_quota', orig_property_quota,
enforce_type=True)
CONF.set_override('image_property_quota', orig_property_quota)
# Create an image (with deployer-defined properties)
req_body = {'name': 'testimg',