openstack/instack-undercloud
Code Issues Proposed changes

Merge "Add UI config endpoints for Ironic Inspector"

Browse Source
This commit is contained in:
Jenkins 2017-07-14 12:37:07 +00:00 committed by Gerrit Code Review
commit 353e949174
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@ -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_keystone: {{UNDERCLOUD_ENDPOINT_KEYSTONE_UI_CONFIG_PUBLIC}}
tripleo::ui::endpoint_config_heat: {{UNDERCLOUD_ENDPOINT_HEAT_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: {{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_mistral: {{UNDERCLOUD_ENDPOINT_MISTRAL_UI_CONFIG_PUBLIC}}
tripleo::ui::endpoint_config_swift: {{UNDERCLOUD_ENDPOINT_SWIFT_UI_CONFIG_PUBLIC}} tripleo::ui::endpoint_config_swift: {{UNDERCLOUD_ENDPOINT_SWIFT_UI_CONFIG_PUBLIC}}

2
instack_undercloud/tests/test_undercloud.py
View File

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

4
instack_undercloud/undercloud.py
View File

@ -877,6 +877,10 @@ def _generate_endpoints(instack_env):
'%s://%s:%d', '%s://%s:%d',
{'host': public_host, 'port': 5050, 'ssl_port': 13050}, {'host': public_host, 'port': 5050, 'ssl_port': 13050},
{'host': internal_host, 'port': 5050}), {'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', ('aodh',
'%s://%s:%d', '%s://%s:%d',
{'host': public_host, 'port': 8042, 'ssl_port': 13042}, {'host': public_host, 'port': 8042, 'ssl_port': 13042},