diff options
| author | Alan Pevec <apevec@redhat.com> | 2013-03-09 01:58:33 +0100 |
|---|---|---|
| committer | Alan Pevec <apevec@redhat.com> | 2013-05-26 17:36:08 +0200 |
| commit | 64738924b87e6fb31d999e25da23f889a2658940 (patch) | |
| tree | ea3abedea6d1ad6c7bc72550129e5f21c7d8eee5 /bin | |
| parent | af4e96986f6ee45e9e4ccac0b143902362a1a676 (diff) | |
| download | keystone-64738924b87e6fb31d999e25da23f889a2658940.tar.gz keystone-64738924b87e6fb31d999e25da23f889a2658940.tar.xz keystone-64738924b87e6fb31d999e25da23f889a2658940.zip | |
separate paste-deploy configuration from parameters
PasteDeploy configuration contains class names which might change
between releases. Keeping it separate from user-configurable
parameters allows deployers to move paste-deploy ini file out of
configuration directory to a place where it can be safely overwritten
on updates e.g. under /usr/share/
DocImpact
Change-Id: I9292ca6226c8430b93565dedd45cc842742a23e2
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/keystone-all | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/bin/keystone-all b/bin/keystone-all index 75bb103a..b38e552b 100755 --- a/bin/keystone-all +++ b/bin/keystone-all @@ -87,15 +87,7 @@ if __name__ == '__main__': if CONF.debug: CONF.log_opt_values(logging.getLogger(CONF.prog), logging.DEBUG) - if CONF.config_file: - paste_config = CONF.config_file[0] - else: - paste_config = CONF.find_file('keystone.conf') - if not paste_config: - print ("The keystone.conf file could not be found in the " - "configuration directories.") - CONF.print_help() - sys.exit(1) + paste_config = config.find_paste_config() monkeypatch_thread = not CONF.standard_threads pydev_debug_url = utils.setup_remote_pydev_debug() @@ -107,8 +99,6 @@ if __name__ == '__main__': monkeypatch_thread = False wsgi_server.monkey_patch_eventlet(monkeypatch_thread=monkeypatch_thread) - options = deploy.appconfig('config:%s' % paste_config) - servers = [] servers.append(create_server(paste_config, 'admin', |