Remove hardcoded endpoint type for keystone

In this commit, Horizon in upstream repo is patched to
remove the hardcoded endpoint type for keystone so that
the default endpoint type specified in settings
(OPENSTACK_ENDPOINT_TYPE) can take effect uniformly across
all services. This change is also required in order to
support intercloud communications securely and uniformly
over mgmt interface via amdin endpoint type.

Story: 2007347
Task: 39464
Change-Id: I56c1aa36ca55360c23f81d4e2b8d15a325617f50
Signed-off-by: Tee Ngo <tee.ngo@windriver.com>
This commit is contained in:
Tee Ngo 2020-04-17 19:27:31 -04:00
parent abc5b27912
commit d5f2693324
3 changed files with 19 additions and 1 deletions

View File

@ -2,4 +2,4 @@ TAR_NAME=horizon
SRC_DIR="$CGCS_BASE/git/horizon"
COPY_LIST="$FILES_BASE/*"
TIS_BASE_SRCREV=a8df389822aaeaa29aded7e8c6614b51748ab914
TIS_PATCH_VER=1
TIS_PATCH_VER=2

View File

@ -0,0 +1,15 @@
index 65706bf..4ddc256 100644
--- a/openstack_dashboard/api/keystone.py
+++ b/openstack_dashboard/api/keystone.py
@@ -93,7 +93,7 @@ class Service(base.APIDictWrapper):
super(Service, self).__init__(service, *args, **kwargs)
self.public_url = base.get_url_for_service(service, region,
'publicURL')
- self.url = base.get_url_for_service(service, region, 'internalURL')
+ self.url = base.get_url_for_service(service, region)
if self.url:
self.host = urlparse.urlparse(self.url).hostname
else:
--
1.8.3.1

View File

@ -29,6 +29,9 @@ Source11: horizon-patching-restart
Source13: guni_config.py
Source14: horizon-assets-compress
# Patches
Patch1: 0001-Remove-the-hard-coded-internal-URL-for-keystone.patch
#
# BuildArch needs to be located below patches in the spec file. Don't ask!
#