openstack/deb-sahara
Code Issues Proposed changes

Merge "Removed unused global var and unnessary param"

Browse Source
This commit is contained in:
Jenkins 2014-05-29 13:58:06 +00:00 committed by Gerrit Code Review
commit c97112403c
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sahara/config.py
View File

@ -82,17 +82,11 @@ CONF.register_cli_opts(cli_opts)
CONF.register_opts(networking_opts) CONF.register_opts(networking_opts)
CONF.register_opts(edp_opts) CONF.register_opts(edp_opts)
ARGV = []
def parse_configs(argv=None, conf_files=None):
if argv is not None:
global ARGV
ARGV = argv
def parse_configs(conf_files=None):
try: try:
version_string = version.version_info.version_string() version_string = version.version_info.version_string()
CONF(ARGV, project='sahara', version=version_string, CONF(project='sahara', version=version_string,
default_config_files=conf_files) default_config_files=conf_files)
except cfg.RequiredOptError as roe: except cfg.RequiredOptError as roe:
raise ex.ConfigurationError( raise ex.ConfigurationError(

3
sahara/main.py
View File

@ -14,7 +14,6 @@
# limitations under the License. # limitations under the License.
import os import os
import sys
import flask import flask
from keystoneclient.middleware import auth_token from keystoneclient.middleware import auth_token
@ -90,7 +89,7 @@ def setup_common(possible_topdir, service_name):
if os.path.exists(dev_conf): if os.path.exists(dev_conf):
config_files = [dev_conf] config_files = [dev_conf]
config.parse_configs(sys.argv[1:], config_files) config.parse_configs(config_files)
log.setup("sahara") log.setup("sahara")
LOG.info('Starting Sahara %s' % service_name) LOG.info('Starting Sahara %s' % service_name)