summaryrefslogtreecommitdiff
path: root/httpd
diff options
context:
space:
mode:
authorBrant Knudson <bknudson@us.ibm.com>2013-12-04 10:59:31 -0600
committerMorgan Fainberg <m@metacloud.com>2013-12-14 21:07:23 -0800
commitd5211b6e26cc6d997a9e61e949e5ec68d3dce884 (patch)
tree798ac065807808f36fe4fe5f4f37418b3d2ddad9 /httpd
parent61a2ad36a6e5ebd48c9634b5115585901d1821fb (diff)
downloadkeystone-d5211b6e26cc6d997a9e61e949e5ec68d3dce884.tar.gz
Cleanup backend loading
Backend creation was happening at import time. This changes the code so that backend creation time is controlled by calling a function. This also allows sharing the backend creation code between the server and the tests. Change-Id: Ib817aa341de510a46faa8ed0bc24ef9268fa944b
Diffstat (limited to 'httpd')
-rw-r--r--httpd/keystone.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/httpd/keystone.py b/httpd/keystone.py
index aa057136c..36a86691d 100644
--- a/httpd/keystone.py
+++ b/httpd/keystone.py
@@ -29,6 +29,7 @@ gettextutils.install('keystone')
from keystone.common import environment
from keystone import config
from keystone.openstack.common import log
+from keystone import service
CONF = config.CONF
@@ -41,6 +42,9 @@ name = os.path.basename(__file__)
if CONF.debug:
CONF.log_opt_values(log.getLogger(CONF.prog), logging.DEBUG)
+
+drivers = service.load_backends()
+
# NOTE(ldbragst): 'application' is required in this context by WSGI spec.
# The following is a reference to Python Paste Deploy documentation
# http://pythonpaste.org/deploy/