openstack
/
instack-undercloud
Code Issues Proposed changes

Configure UI endpoints to use Keystone v3 

The Keystone endpoint should now point to v3, and other URLs should
reference %(project_id)s as opposed to %(tenant_id)s.

Change-Id: I7be5d72b1a9ebf60d81346d530af9625c95d7914
Closes-Bug: #1692046
This commit is contained in:
Julie Pichon 2017-05-19 16:37:42 +01:00
parent f141305a8b
commit 39cf7a7fe0
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instack_undercloud/tests/test_undercloud.py
View File

@ -472,7 +472,7 @@ class TestGenerateEnvironment(BaseTestCase):
env['UNDERCLOUD_ENDPOINT_KEYSTONE_INTERNAL'])
self.assertEqual('http://192.168.24.3:35357',
env['UNDERCLOUD_ENDPOINT_KEYSTONE_ADMIN'])
self.assertEqual('https://192.168.24.2:443/keystone/v2.0',
self.assertEqual('https://192.168.24.2:443/keystone/v3',
env['UNDERCLOUD_ENDPOINT_KEYSTONE_UI_CONFIG_PUBLIC'])
# Also check that the tenant id part is preserved
self.assertEqual('https://192.168.24.2:13808/v1/AUTH_%(tenant_id)s',

6
instack_undercloud/undercloud.py
View File

@ -782,7 +782,7 @@ def _generate_endpoints(instack_env):
{'host': public_host, 'port': 8004, 'ssl_port': 13004},
{'host': internal_host, 'port': 8004}),
('heat-ui-config',
'%s://%s:%d/heat/v1/%%(tenant_id)s',
'%s://%s:%d/heat/v1/%%(project_id)s',
{'host': public_host, 'port': 3000, 'ssl_port': 443},
{'host': internal_host, 'port': 3000}),
('neutron',
@ -811,7 +811,7 @@ def _generate_endpoints(instack_env):
{'host': internal_host, 'port': 5000},
{'host': internal_host, 'port': 35357}),
('keystone-ui-config',
'%s://%s:%d/keystone/v2.0',
'%s://%s:%d/keystone/v3',
{'host': public_host, 'port': 3000, 'ssl_port': 443},
{'host': internal_host, 'port': 3000},
{'host': internal_host, 'port': 35357}),
@ -824,7 +824,7 @@ def _generate_endpoints(instack_env):
{'host': public_host, 'port': 8080, 'ssl_port': 13808},
{'host': internal_host, 'port': 8080}),
('swift-ui-config',
'%s://%s:%d/swift/v1/AUTH_%%(tenant_id)s',
'%s://%s:%d/swift/v1/AUTH_%%(project_id)s',
{'host': public_host, 'port': 3000, 'ssl_port': 443},
{'host': internal_host, 'port': 3000}),
('ironic',

7
releasenotes/notes/update-ui-config-18c8701da3f7d3c1.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
The TripleO UI now supports Keystone v3 and %(project_id)s
placeholders in URLs. Updated the endpoints in the configuration to
reflect this. (Fixes bug `bug 1692046
<https://bugs.launchpad.net/tripleo/+bug/1692046>`__)