summaryrefslogtreecommitdiff
path: root/ironic/api/acl.py
diff options
context:
space:
mode:
authorYuriy Zveryanskyy <yzveryanskyy@mirantis.com>2013-10-16 20:04:42 +0300
committerYuriy Zveryanskyy <yzveryanskyy@mirantis.com>2013-10-30 13:22:19 +0200
commit72d3ed992ddd7409577d71549f2aa0ce712b4557 (patch)
tree6e7a645a4a69aa7817dc7a780c563ab4dd73df8c /ironic/api/acl.py
parentedaf5ad7c06949233a8bca0132d89eca552e7fae (diff)
downloadironic-72d3ed992ddd7409577d71549f2aa0ce712b4557.tar.gz
Add wrapper for keystone service catalog
This patch designed for receiving url of any openstack service from keystone service catalog. Examples: Ironic conductor and api are on different hosts, conductor needs api url for deploy image, get Glance service api for Ironic. Change-Id: I3dc7475e10c7a464541be64d69ce97c41be7a650
Diffstat (limited to 'ironic/api/acl.py')
-rw-r--r--ironic/api/acl.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/ironic/api/acl.py b/ironic/api/acl.py
index 453b67b46..b9bf8fc0d 100644
--- a/ironic/api/acl.py
+++ b/ironic/api/acl.py
@@ -36,9 +36,6 @@ def register_opts(conf):
keystone_auth_token.CONF = conf
-register_opts(cfg.CONF)
-
-
def install(app, conf, public_routes):
"""Install ACL check on application.
@@ -49,6 +46,7 @@ def install(app, conf, public_routes):
:return: The same WSGI application with ACL installed.
"""
+ register_opts(cfg.CONF)
keystone_config = dict(conf.get(OPT_GROUP_NAME))
return auth_token.AuthTokenMiddleware(app,
conf=keystone_config,