openstack/deb-sahara
Code Issues Proposed changes

unused config item has been removed

Browse Source
This commit is contained in:
Sergey Lukjanov 2013-03-21 23:04:24 +04:00
parent 56a7a33348
commit 569eb9f45a
5 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/savanna/savanna.conf.sample
View File

@ -2,7 +2,6 @@
# REST API config # REST API config
#port=8080 #port=8080
#log_level=WARN
#allow_cluster_ops=false #allow_cluster_ops=false
# Address and credentials that will be used to check auth tokens # Address and credentials that will be used to check auth tokens

3
etc/savanna/savanna.conf.sample-full
View File

@ -10,9 +10,6 @@
# set port (integer value) # set port (integer value)
#port=8080 #port=8080
# set application log level (string value)
#log_level=WARN
# resets DB (boolean value) # resets DB (boolean value)
#reset_db=false #reset_db=false

2
savanna/config.py
View File

@ -20,8 +20,6 @@ cli_opts = [
help='set host'), help='set host'),
cfg.IntOpt('port', default=8080, cfg.IntOpt('port', default=8080,
help='set port'), help='set port'),
cfg.StrOpt('log-level', default='WARN',
help='set application log level'),
cfg.BoolOpt('reset-db', default=False, cfg.BoolOpt('reset-db', default=False,
help='resets DB'), help='resets DB'),
cfg.BoolOpt('stub-data', default=False, cfg.BoolOpt('stub-data', default=False,

1
savanna/main.py
View File

@ -72,7 +72,6 @@ sqlalchemy_opts = [
CONF = cfg.CONF CONF = cfg.CONF
CONF.register_opts(opts) CONF.register_opts(opts)
CONF.register_opts(sqlalchemy_opts, group='sqlalchemy') CONF.register_opts(sqlalchemy_opts, group='sqlalchemy')
CONF.import_opt('log_level', 'savanna.config')
def make_app(): def make_app():

4
savanna/tests/unit/test_api_v02.py
View File

@ -84,7 +84,7 @@ def _stub_auth_valid(*args, **kwargs):
CONF = cfg.CONF CONF = cfg.CONF
CONF.import_opt('reset_db', 'savanna.config') CONF.import_opt('reset_db', 'savanna.config')
CONF.import_opt('stub_data', 'savanna.config') CONF.import_opt('stub_data', 'savanna.config')
CONF.import_opt('log_level', 'savanna.config') CONF.import_opt('debug', 'savanna.openstack.common.log')
CONF.import_opt('allow_cluster_ops', 'savanna.config') CONF.import_opt('allow_cluster_ops', 'savanna.config')
CONF.import_opt('database_uri', 'savanna.main', group='sqlalchemy') CONF.import_opt('database_uri', 'savanna.main', group='sqlalchemy')
CONF.import_opt('echo', 'savanna.main', group='sqlalchemy') CONF.import_opt('echo', 'savanna.main', group='sqlalchemy')
@ -98,7 +98,7 @@ class TestApi(unittest.TestCase):
# override configs # override configs
CONF.set_override('reset_db', True) CONF.set_override('reset_db', True)
CONF.set_override('stub_data', True) CONF.set_override('stub_data', True)
CONF.set_override('log_level', 'DEBUG') CONF.set_override('debug', True)
CONF.set_override('allow_cluster_ops', True) # stub process CONF.set_override('allow_cluster_ops', True) # stub process
CONF.set_override('database_uri', 'sqlite:///' + self.db_path, CONF.set_override('database_uri', 'sqlite:///' + self.db_path,
group='sqlalchemy') group='sqlalchemy')