diff --git a/glance/async/flows/api_image_import.py b/glance/async/flows/api_image_import.py index 41e47bf744..e5036f69ee 100644 --- a/glance/async/flows/api_image_import.py +++ b/glance/async/flows/api_image_import.py @@ -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 diff --git a/glance/async/flows/base_import.py b/glance/async/flows/base_import.py index e9ff53a417..4fc79c847c 100644 --- a/glance/async/flows/base_import.py +++ b/glance/async/flows/base_import.py @@ -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 diff --git a/glance/cmd/cache_cleaner.py b/glance/cmd/cache_cleaner.py index bb2a54d545..3e304495b2 100644 --- a/glance/cmd/cache_cleaner.py +++ b/glance/cmd/cache_cleaner.py @@ -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(): diff --git a/glance/cmd/cache_prefetcher.py b/glance/cmd/cache_prefetcher.py index f22600e3f7..5310f7a398 100644 --- a/glance/cmd/cache_prefetcher.py +++ b/glance/cmd/cache_prefetcher.py @@ -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(): diff --git a/glance/cmd/cache_pruner.py b/glance/cmd/cache_pruner.py index 4e4aa9bee6..45d1bc9627 100644 --- a/glance/cmd/cache_pruner.py +++ b/glance/cmd/cache_pruner.py @@ -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(): diff --git a/glance/cmd/manage.py b/glance/cmd/manage.py index 3008e6a69a..0daac4e5ef 100644 --- a/glance/cmd/manage.py +++ b/glance/cmd/manage.py @@ -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', diff --git a/glance/cmd/replicator.py b/glance/cmd/replicator.py index d71d7f4491..4580f85abd 100644 --- a/glance/cmd/replicator.py +++ b/glance/cmd/replicator.py @@ -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... diff --git a/glance/cmd/scrubber.py b/glance/cmd/scrubber.py index 8eadb4ee98..8a39c32ec8 100644 --- a/glance/cmd/scrubber.py +++ b/glance/cmd/scrubber.py @@ -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(): diff --git a/glance/tests/functional/db/test_simple.py b/glance/tests/functional/db/test_simple.py index 128330dc2c..ff7c68d997 100644 --- a/glance/tests/functional/db/test_simple.py +++ b/glance/tests/functional/db/test_simple.py @@ -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 diff --git a/glance/tests/integration/v2/test_property_quota_violations.py b/glance/tests/integration/v2/test_property_quota_violations.py index 3c9a7a80ac..b955009fa0 100644 --- a/glance/tests/integration/v2/test_property_quota_violations.py +++ b/glance/tests/integration/v2/test_property_quota_violations.py @@ -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',