openstack/instack-undercloud
Code Issues Proposed changes

Add Nova UI endpoints to the endpoint list

Browse Source 
In addition to puppet-stack-config.yaml
(cf. I1de069a4d3786af030530a100982087c0784889e), the endpoints also
need to be specified in the main endpoints list.

Change-Id: I3701c34841b84c2272dcc24d982fc622ff6139b6
Partial-Bug: #1755560
(cherry picked from commit 20c4088afb)
This commit is contained in:
Julie Pichon
2018-03-13 17:20:49 +00:00
parent e3142ba286
commit 28126ac3f4
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
instack_undercloud/tests/test_undercloud.py
View File

@@ -589,7 +589,7 @@ class TestGenerateEnvironment(BaseTestCase):
env = undercloud._generate_environment('.')
endpoint_vars = {k: v for (k, v) in env.items()
if k.startswith('UNDERCLOUD_ENDPOINT')}
self.assertEqual(90, len(endpoint_vars))
self.assertEqual(96, len(endpoint_vars))
# Spot check one service
self.assertEqual('http://192.168.24.1:5000',
env['UNDERCLOUD_ENDPOINT_KEYSTONE_PUBLIC'])

8
instack_undercloud/undercloud.py
View File

@@ -967,6 +967,14 @@ def _generate_endpoints(instack_env):
'%s://%s:%d/v2.1',
{'host': public_host, 'port': 8774, 'ssl_port': 13774},
{'host': internal_host, 'port': 8774}),
('nova-ui-proxy',
'%s://%s:%d',
{'host': public_host, 'port': 8774, 'ssl_port': 13774},
{'host': internal_host, 'port': 8774}),
('nova-ui-config',
'%s://%s:%d/nova/v2.1',
{'host': public_host, 'port': 3000, 'ssl_port': 443},
{'host': internal_host, 'port': 3000}),
('placement',
'%s://%s:%d/placement',
{'host': public_host, 'port': 8778, 'ssl_port': 13778},