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 /httpd | |
| parent | af4e96986f6ee45e9e4ccac0b143902362a1a676 (diff) | |
| download | keystone-64738924b87e6fb31d999e25da23f889a2658940.tar.gz | |
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 'httpd')
| -rw-r--r--[-rwxr-xr-x] | httpd/keystone.py | 8 | ||||
| -rw-r--r-- | httpd/wsgi-keystone.conf (renamed from httpd/keystone.conf) | 0 |
2 files changed, 2 insertions, 6 deletions
diff --git a/httpd/keystone.py b/httpd/keystone.py index 9477044b3..8b1ab7401 100755..100644 --- a/httpd/keystone.py +++ b/httpd/keystone.py @@ -7,15 +7,11 @@ from keystone import config LOG = logging.getLogger(__name__) CONF = config.CONF -config_files = ['/etc/keystone/keystone.conf'] -CONF(project='keystone', default_config_files=config_files) +CONF(project='keystone') -conf = CONF.config_file[0] name = os.path.basename(__file__) if CONF.debug: CONF.log_opt_values(logging.getLogger(CONF.prog), logging.DEBUG) -options = deploy.appconfig('config:%s' % CONF.config_file[0]) - -application = deploy.loadapp('config:%s' % conf, name=name) +deploy.loadapp('config:%s' % config.find_paste_config(), name=name) diff --git a/httpd/keystone.conf b/httpd/wsgi-keystone.conf index d542a878a..d542a878a 100644 --- a/httpd/keystone.conf +++ b/httpd/wsgi-keystone.conf |