Browse Source

Respect endpoint type specified in Horizon

The CloudKitty dashboard now inherits the interface type from Horizon.
This allows for easier testing, like in an all-in-one to use the
internalURL.

Change-Id: I28d6d1ac1a9d8db4accc4cadc5da261cb86330fd
Story: 2008879
Task: 42440
(cherry picked from commit 19ead1f072)
changes/70/790170/1
Jonathan Herlin 6 months ago
committed by Jonathan Herlin
parent
commit
2a24f55f83
  1. 2
      cloudkittydashboard/api/cloudkitty.py
  2. 6
      releasenotes/notes/keystone-endpoint-type-b5646c052e65c848.yaml

2
cloudkittydashboard/api/cloudkitty.py

@ -29,6 +29,7 @@ def cloudkittyclient(request):
cacert = getattr(settings, 'OPENSTACK_SSL_CACERT', None)
insecure = getattr(settings, 'OPENSTACK_SSL_NO_VERIFY', False)
auth_url = getattr(settings, 'OPENSTACK_KEYSTONE_URL', None)
interface = getattr(settings, 'OPENSTACK_ENDPOINT_TYPE', 'publicURL')
auth = Token(
auth_url,
token=request.user.token.id,
@ -38,6 +39,7 @@ def cloudkittyclient(request):
adapter_options = {
'region_name': request.user.services_region,
'interface': interface,
}
return ck_client.Client(

6
releasenotes/notes/keystone-endpoint-type-b5646c052e65c848.yaml

@ -0,0 +1,6 @@
---
upgrade:
- |
The CloudKitty dashboard now inherits the interface type from Horizon.
This allows for easier testing, like in an all-in-one to use the
internalURL.
Loading…
Cancel
Save