diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-25 16:06:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-25 16:06:17 +0000 |
| commit | 0f7c0d7fec3d53561473f3924ef37e86ac66d484 (patch) | |
| tree | 44f9959056c9bcdfbd99f2e3d7c7888cc7c32b3d | |
| parent | b19a48cc031563a8852a610a2ebd081baeb7d060 (diff) | |
| parent | 19c0e8d856049677bc7de2bc293a87a0aac306f8 (diff) | |
Merge "Fix wsgi config file access for HTTPD"
| -rwxr-xr-x | httpd/keystone.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/httpd/keystone.py b/httpd/keystone.py index bfa06180..0982cdf8 100755 --- a/httpd/keystone.py +++ b/httpd/keystone.py @@ -7,8 +7,8 @@ from keystone.common import logging LOG = logging.getLogger(__name__) CONF = config.CONF -config_files = ['/etc/keystone.conf'] -CONF(config_files=config_files) +config_files = ['/etc/keystone/keystone.conf'] +CONF(project='keystone', default_config_files=config_files) conf = CONF.config_file[0] name = os.path.basename(__file__) |