openstack
/
instack-undercloud
Code Issues Proposed changes

Merge "Add Nova UI endpoints to the endpoint list"

This commit is contained in:
Zuul 2018-03-23 22:17:14 +00:00 committed by Gerrit Code Review
parent 41f2694d13 20c4088afb
commit d19bf1ce59
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instack_undercloud/tests/test_undercloud.py
View File

@ -587,7 +587,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('https://192.168.24.2:13000',
env['UNDERCLOUD_ENDPOINT_KEYSTONE_PUBLIC'])

8
instack_undercloud/undercloud.py
View File

@ -962,6 +962,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},