diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-11-14 13:57:32 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-11-14 13:57:32 +0000 |
commit | 76a7420f7ff7635f9d188d2ef9ab783c58cc04a5 (patch) | |
tree | 1b92a728797d3499b4354c6511039931a9cba58b | |
parent | 5502ab9f1e437e73046b31476c542be90b5b0aae (diff) | |
parent | e239fb78e07a86daee3821ccabc3e929cf5ab79f (diff) | |
download | django_openstack_auth-76a7420f7ff7635f9d188d2ef9ab783c58cc04a5.tar.gz |
Merge "Set default auth_url from django settings when auth_url is None"
-rw-r--r-- | openstack_auth/backend.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/openstack_auth/backend.py b/openstack_auth/backend.py index 1d56103..cc50f56 100644 --- a/openstack_auth/backend.py +++ b/openstack_auth/backend.py @@ -74,6 +74,9 @@ class KeystoneBackend(object): endpoint_type = getattr( settings, 'OPENSTACK_ENDPOINT_TYPE', 'publicURL') + if auth_url is None: + auth_url = settings.OPENSTACK_KEYSTONE_URL + # keystone client v3 does not support logging in on the v2 url any more if utils.get_keystone_version() >= 3: if utils.has_in_url_path(auth_url, "/v2.0"): |