summaryrefslogtreecommitdiffstats
path: root/httpd/keystone.py
diff options
context:
space:
mode:
Diffstat (limited to 'httpd/keystone.py')
-rw-r--r--[-rwxr-xr-x]httpd/keystone.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/httpd/keystone.py b/httpd/keystone.py
index 9477044b..8b1ab740 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)