d197336e5e
On the review that introduce the upstream/openstack folder to this repo [1], the centos folders for all packages were removed, as they're not used anymore. This wasn't true for the Horizon package, as it contained some files on the centos folder that were used on the downloader. This change reintroduces those files under the debian folder, fixing their directory on the meta_data.yaml file of this package. None of the files under /upstream/openstack/python-horizon/debian/files/* were changed, they were only copied from [2] [1] https://review.opendev.org/c/starlingx/openstack-armada-app/+/886027 [2] https://opendev.org/starlingx/upstream/src/branch/master/openstack/python-horizon/centos/files Test Plan: PASS: Run downloader for the Horizon package PASS: Build Horizon package PASS: Build stx-horizon image Story: 2010774 Task: 48115 Change-Id: Ibe92cd40cc5f16f105a6812d9a86cb772e15f2b0 Signed-off-by: Lucas de Ataides <lucas.deataidesbarreto@windriver.com>
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
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
|
|
+++ b/openstack_dashboard/api/keystone.py
|
|
@@ -79,7 +79,8 @@ 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')
|
|
+ ep_type = getattr(settings, 'OPENSTACK_ENDPOINT_TYPE', 'internalURL')
|
|
+ self.url = base.get_url_for_service(service, region, ep_type)
|
|
if self.url:
|
|
self.host = urlparse.urlparse(self.url).hostname
|
|
else:
|
|
--
|
|
1.8.3.1
|
|
|