Merge "Remove usage of parameter enforce_type"
This commit is contained in:
commit
f24aebaca9
@ -101,8 +101,7 @@ class _VerifyStaging(task.Task):
|
|||||||
backend.register_opts(conf)
|
backend.register_opts(conf)
|
||||||
conf.set_override('filesystem_store_datadir',
|
conf.set_override('filesystem_store_datadir',
|
||||||
CONF.node_staging_uri[7:],
|
CONF.node_staging_uri[7:],
|
||||||
group='glance_store',
|
group='glance_store')
|
||||||
enforce_type=True)
|
|
||||||
|
|
||||||
# NOTE(flaper87): Do not even try to judge me for this... :(
|
# NOTE(flaper87): Do not even try to judge me for this... :(
|
||||||
# With the glance_store refactor, this code will change, until
|
# With the glance_store refactor, this code will change, until
|
||||||
|
@ -115,8 +115,7 @@ class _ImportToFS(task.Task):
|
|||||||
backend.register_opts(conf)
|
backend.register_opts(conf)
|
||||||
conf.set_override('filesystem_store_datadir',
|
conf.set_override('filesystem_store_datadir',
|
||||||
CONF.task.work_dir,
|
CONF.task.work_dir,
|
||||||
group='glance_store',
|
group='glance_store')
|
||||||
enforce_type=True)
|
|
||||||
|
|
||||||
# NOTE(flaper87): Do not even try to judge me for this... :(
|
# NOTE(flaper87): Do not even try to judge me for this... :(
|
||||||
# With the glance_store refactor, this code will change, until
|
# With the glance_store refactor, this code will change, until
|
||||||
|
@ -47,7 +47,7 @@ from glance.image_cache import cleaner
|
|||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
logging.register_options(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():
|
def main():
|
||||||
|
@ -41,7 +41,7 @@ from glance.image_cache import prefetcher
|
|||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
logging.register_options(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():
|
def main():
|
||||||
|
@ -39,7 +39,7 @@ from glance.image_cache import pruner
|
|||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
logging.register_options(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():
|
def main():
|
||||||
|
@ -434,7 +434,7 @@ def main():
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
logging.register_options(CONF)
|
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',
|
cfg_files = cfg.find_config_files(project='glance',
|
||||||
prog='glance-registry')
|
prog='glance-registry')
|
||||||
cfg_files.extend(cfg.find_config_files(project='glance',
|
cfg_files.extend(cfg.find_config_files(project='glance',
|
||||||
|
@ -100,7 +100,7 @@ CONF.register_opt(
|
|||||||
"one. This is the token used for the target.")))
|
"one. This is the token used for the target.")))
|
||||||
|
|
||||||
logging.register_options(CONF)
|
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
|
# 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...
|
# it will override what happens to be installed in /usr/(local/)lib/python...
|
||||||
|
@ -43,7 +43,7 @@ eventlet.patcher.monkey_patch(all=False, socket=True, time=True, select=True,
|
|||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
logging.register_options(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():
|
def main():
|
||||||
|
@ -21,9 +21,8 @@ from glance.tests.functional.db import base
|
|||||||
|
|
||||||
|
|
||||||
def get_db(config, workers=1):
|
def get_db(config, workers=1):
|
||||||
CONF.set_override('data_api', 'glance.db.simple.api',
|
CONF.set_override('data_api', 'glance.db.simple.api')
|
||||||
enforce_type=True)
|
CONF.set_override('workers', workers)
|
||||||
CONF.set_override('workers', workers, enforce_type=True)
|
|
||||||
db_api = glance.db.get_api()
|
db_api = glance.db.get_api()
|
||||||
return db_api
|
return db_api
|
||||||
|
|
||||||
|
@ -71,8 +71,7 @@ class TestPropertyQuotaViolations(base.ApiTest):
|
|||||||
self.assertEqual(0, len(image_list))
|
self.assertEqual(0, len(image_list))
|
||||||
|
|
||||||
orig_property_quota = 10
|
orig_property_quota = 10
|
||||||
CONF.set_override('image_property_quota', orig_property_quota,
|
CONF.set_override('image_property_quota', orig_property_quota)
|
||||||
enforce_type=True)
|
|
||||||
|
|
||||||
# Create an image (with deployer-defined properties)
|
# Create an image (with deployer-defined properties)
|
||||||
req_body = {'name': 'testimg',
|
req_body = {'name': 'testimg',
|
||||||
|
Loading…
Reference in New Issue
Block a user