From 20c4088afb8d0dac1f3c639b8ae99b3bdd3b2fca Mon Sep 17 00:00:00 2001 From: Julie Pichon Date: Tue, 13 Mar 2018 17:20:49 +0000 Subject: [PATCH] Add Nova UI endpoints to the endpoint list 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 --- instack_undercloud/tests/test_undercloud.py | 2 +- instack_undercloud/undercloud.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/instack_undercloud/tests/test_undercloud.py b/instack_undercloud/tests/test_undercloud.py index b3eece8c7..d551ffa9e 100644 --- a/instack_undercloud/tests/test_undercloud.py +++ b/instack_undercloud/tests/test_undercloud.py @@ -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']) diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py index 7fe242627..018c69d4e 100644 --- a/instack_undercloud/undercloud.py +++ b/instack_undercloud/undercloud.py @@ -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},