starlingx/upstream
Code Issues Proposed changes

Merge "Set service's self url based on settings for Horizon"

Browse Source
This commit is contained in:
Zuul 2020-05-07 16:30:07 +00:00 committed by Gerrit Code Review
commit f838c8386b
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openstack/python-horizon/centos/files/0001-Remove-the-hard-coded-internal-URL-for-keystone.patch
View File

@ -1,12 +1,24 @@
index 65706bf..4ddc256 100644 From 0887c59ddffa53a8816e7a30f85fa49bdfce1881 Mon Sep 17 00:00:00 2001
From: Andy Ning <andy.ning@windriver.com>
Date: Thu, 30 Apr 2020 11:45:55 -0400
Subject: [PATCH] Remove-the-hard-coded-internal-URL-for-keystone
Signed-off-by: Andy Ning <andy.ning@windriver.com>
---
openstack_dashboard/api/keystone.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/openstack_dashboard/api/keystone.py b/openstack_dashboard/api/keystone.py
index af3d779..e4a9ef7 100644
--- a/openstack_dashboard/api/keystone.py --- a/openstack_dashboard/api/keystone.py
+++ b/openstack_dashboard/api/keystone.py +++ b/openstack_dashboard/api/keystone.py
@@ -93,7 +93,7 @@ class Service(base.APIDictWrapper): @@ -79,7 +79,8 @@ class Service(base.APIDictWrapper):
super(Service, self).__init__(service, *args, **kwargs) super(Service, self).__init__(service, *args, **kwargs)
self.public_url = base.get_url_for_service(service, region, self.public_url = base.get_url_for_service(service, region,
'publicURL') 'publicURL')
- self.url = base.get_url_for_service(service, region, 'internalURL') - self.url = base.get_url_for_service(service, region, 'internalURL')
+ self.url = base.get_url_for_service(service, region) + ep_type = getattr(settings, 'OPENSTACK_ENDPOINT_TYPE', 'internalURL')
+ self.url = base.get_url_for_service(service, region, ep_type)
if self.url: if self.url:
self.host = urlparse.urlparse(self.url).hostname self.host = urlparse.urlparse(self.url).hostname
else: else: