openstack/puppet-tripleo
Code Issues Proposed changes

Support for proxying ironic-inspector via Apache

Browse Source 
Future work in the UI requires Apache to proxy for the
ironic-inspector service the same as it has for other
related services.  This adds support for ironic-inspector
through Apache's mod_proxy

Closes-Bug: 1695202
Depends-On: Id395604f1dfbc4bf4f26adbe05f484a10227fd76
Change-Id: I9dcb0769ff90a2fc9561cb86bb822be8087ffe8e
This commit is contained in:
Jenkins 2017-05-31 11:06:51 +00:00 committed by Dan Trainor
parent 312b3d47b5
commit 4216c6bff1
3 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
manifests/ui.pp
View File

@ -65,10 +65,18 @@
# The ironic proxy endpoint url
# Defaults to undef
#
# [*endpoint_proxy_ironic_inspector*]
# The ironic inspector proxy endpoint url
# Defaults to undef
#
# [*endpoint_config_ironic*]
# The ironic config endpoint url
# Defaults to undef
#
# [*endpoint_config_ironic_inspector*]
# The ironic inspector config endpoint url
# Defaults to undef
#
# [*endpoint_proxy_mistral*]
# The mistral proxy endpoint url
# Defaults to undef
@ -112,18 +120,20 @@ class tripleo::ui (
'ko-KR' => 'Korean',
'zh-CN' => 'Simplified Chinese'
},
$endpoint_proxy_zaqar = undef,
$endpoint_proxy_keystone = undef,
$endpoint_proxy_heat = undef,
$endpoint_proxy_ironic = undef,
$endpoint_proxy_mistral = undef,
$endpoint_proxy_swift = undef,
$endpoint_config_zaqar = undef,
$endpoint_config_keystone = undef,
$endpoint_config_heat = undef,
$endpoint_config_ironic = undef,
$endpoint_config_mistral = undef,
$endpoint_config_swift = undef,
$endpoint_proxy_zaqar = undef,
$endpoint_proxy_keystone = undef,
$endpoint_proxy_heat = undef,
$endpoint_proxy_ironic = undef,
$endpoint_proxy_ironic_inspector = undef,
$endpoint_proxy_mistral = undef,
$endpoint_proxy_swift = undef,
$endpoint_config_zaqar = undef,
$endpoint_config_keystone = undef,
$endpoint_config_heat = undef,
$endpoint_config_ironic = undef,
$endpoint_config_ironic_inspector = undef,
$endpoint_config_mistral = undef,
$endpoint_config_swift = undef,
) {
@ -159,6 +169,11 @@ class tripleo::ui (
'url' => $endpoint_proxy_ironic,
'reverse_urls' => $endpoint_proxy_ironic
},
{
'path' => '/ironic-inspector',
'url' => $endpoint_proxy_ironic_inspector,
'reverse_urls' => $endpoint_proxy_ironic_inspector
},
{
'path' => '/mistral',
'url' => $endpoint_proxy_mistral,

6
releasenotes/notes/add-support-for-proxying-ironic-inspector-via-apache-ea70e9fa1ad04553.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Added variables for endpoint_proxy_ironic_inspector,
endpoint_config_ironic_inspector, and Apache mod_proxy configuration to
proxy ironic-inspector service just like similar services

1
templates/ui/tripleo_ui_config.js.erb
View File

@ -7,6 +7,7 @@ window.tripleOUiConfig = {
'keystone': '<%= @endpoint_config_keystone %>',
'heat': '<%= @endpoint_config_heat %>',
'ironic': '<%= @endpoint_config_ironic %>',
'ironic-inspector': '<%= @endpoint_config_ironic_inspector %>',
'mistral': '<%= @endpoint_config_mistral %>',
'swift': '<%= @endpoint_config_swift %>',
'zaqar-websocket': '<%= @endpoint_config_zaqar %>',