diff options
| author | Takashi Kajinami <tkajinam@redhat.com> | 2022-12-19 17:05:10 +0900 |
|---|---|---|
| committer | Akihiro Motoki <amotoki@gmail.com> | 2022-12-26 07:01:07 +0900 |
| commit | 9fa98969e728b94899de113a5174a955bbc70bd1 (patch) | |
| tree | d6ab505503c4e2241c880ee330de4d8fcd9fd352 /openstack_auth | |
| parent | 0add65eddcd6e70d4fbe76951d76c66ecc1a34b3 (diff) | |
| download | horizon-9fa98969e728b94899de113a5174a955bbc70bd1.tar.gz | |
Use OPENSTACK_ENDPOINT_TYPE by default
This is follow-up of I8438bedaf7cead452fc499e484d23690b48894d9 and
ensures the OPENSTACK_ENDPOINT_TYPE parameter is used when
OPENSTACK_KEYSTONE_ENDPOINT_TYPE is not set. This avoids backward-
incompatible change which affects deployments with endpoint type set
to non-default values.
Co-Authored-By: Akihiro Motoki <amotoki@gmail.com>
Change-Id: I94d2d3e31fc0103773fb5d3ed2f5f792e8851f78
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 |