diff options
Diffstat (limited to 'openstack_auth')
| -rw-r--r-- | openstack_auth/backend.py | 5 | ||||
| -rw-r--r-- | openstack_auth/defaults.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/openstack_auth/backend.py b/openstack_auth/backend.py index d3546661d..febacec2a 100644 --- a/openstack_auth/backend.py +++ b/openstack_auth/backend.py @@ -171,7 +171,10 @@ class KeystoneBackend(object): region_name = id_endpoint['region'] break - interface = settings.OPENSTACK_KEYSTONE_ENDPOINT_TYPE + if settings.OPENSTACK_KEYSTONE_ENDPOINT_TYPE: + interface = settings.OPENSTACK_KEYSTONE_ENDPOINT_TYPE + else: + interface = settings.OPENSTACK_ENDPOINT_TYPE endpoint = scoped_auth_ref.service_catalog.url_for( service_type='identity', diff --git a/openstack_auth/defaults.py b/openstack_auth/defaults.py index 0c93841cf..1495f52c3 100644 --- a/openstack_auth/defaults.py +++ b/openstack_auth/defaults.py @@ -28,7 +28,7 @@ OPENSTACK_KEYSTONE_URL = "http://localhost/identity/v3" # TODO(amotoki): The default value in openstack_dashboard is different: # publicURL. It should be consistent. OPENSTACK_ENDPOINT_TYPE = 'public' -OPENSTACK_KEYSTONE_ENDPOINT_TYPE = 'public' +OPENSTACK_KEYSTONE_ENDPOINT_TYPE = None OPENSTACK_SSL_NO_VERIFY = False # TODO(amotoki): Is it correct? OPENSTACK_SSL_CACERT = True |