From 63a6e69c56d08353783da48e09d38f85c383b30a Mon Sep 17 00:00:00 2001 From: Julie Pichon Date: Wed, 12 Jul 2017 11:01:14 +0100 Subject: [PATCH] Add UI config endpoints for Ironic Inspector Change-Id: I5a014f4a1cd10229ab2a27779136ec0159a26900 Closes-Bug: #1703596 --- .../puppet-stack-config/puppet-stack-config.yaml.template | 2 +- instack_undercloud/tests/test_undercloud.py | 2 +- instack_undercloud/undercloud.py | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template index 806cfa8e3..7499f10de 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -763,7 +763,7 @@ tripleo::ui::endpoint_config_zaqar: {{UNDERCLOUD_ENDPOINT_ZAQAR_UI_CONFIG_PUBLIC tripleo::ui::endpoint_config_keystone: {{UNDERCLOUD_ENDPOINT_KEYSTONE_UI_CONFIG_PUBLIC}} tripleo::ui::endpoint_config_heat: {{UNDERCLOUD_ENDPOINT_HEAT_UI_CONFIG_PUBLIC}} tripleo::ui::endpoint_config_ironic: {{UNDERCLOUD_ENDPOINT_IRONIC_UI_CONFIG_PUBLIC}} -tripleo::ui::endpoint_config_ironic_inspector: {{UNDERCLOUD_ENDPOINT_IRONIC_UI_CONFIG_PUBLIC}} +tripleo::ui::endpoint_config_ironic_inspector: {{UNDERCLOUD_ENDPOINT_IRONIC_INSPECTOR_UI_CONFIG_PUBLIC}} tripleo::ui::endpoint_config_mistral: {{UNDERCLOUD_ENDPOINT_MISTRAL_UI_CONFIG_PUBLIC}} tripleo::ui::endpoint_config_swift: {{UNDERCLOUD_ENDPOINT_SWIFT_UI_CONFIG_PUBLIC}} diff --git a/instack_undercloud/tests/test_undercloud.py b/instack_undercloud/tests/test_undercloud.py index 70dbb1fc9..d5740bf08 100644 --- a/instack_undercloud/tests/test_undercloud.py +++ b/instack_undercloud/tests/test_undercloud.py @@ -452,7 +452,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(93, 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 e3cae79d3..fad1fe71f 100644 --- a/instack_undercloud/undercloud.py +++ b/instack_undercloud/undercloud.py @@ -856,6 +856,10 @@ def _generate_endpoints(instack_env): '%s://%s:%d', {'host': public_host, 'port': 5050, 'ssl_port': 13050}, {'host': internal_host, 'port': 5050}), + ('ironic_inspector-ui-config', + '%s://%s:%d/ironic-inspector', + {'host': public_host, 'port': 3000, 'ssl_port': 443}, + {'host': internal_host, 'port': 3000}), ('aodh', '%s://%s:%d', {'host': public_host, 'port': 8042, 'ssl_port': 13042},