aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-31 11:06:51 +0000
committerDan Trainor <dan.trainor@gmail.com>2017-06-05 10:28:14 -0400
commit4216c6bff1c9322cccc220e0c83acedc1d4d17c5 (patch)
tree8c658a461e72ae7e1636027617ecdb1ac49ff154
parent312b3d47b5c97718dcb0b05cf242800a0281d0ab (diff)
Support for proxying ironic-inspector via Apache
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
-rw-r--r--manifests/ui.pp39
-rw-r--r--releasenotes/notes/add-support-for-proxying-ironic-inspector-via-apache-ea70e9fa1ad04553.yaml6
-rw-r--r--templates/ui/tripleo_ui_config.js.erb1
3 files changed, 34 insertions, 12 deletions
diff --git a/manifests/ui.pp b/manifests/ui.pp
index 1745535..825ffc2 100644
--- a/manifests/ui.pp
+++ b/manifests/ui.pp
@@ -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,
) {
@@ -160,6 +170,11 @@ class tripleo::ui (
'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,
'reverse_urls' => $endpoint_proxy_mistral
diff --git a/releasenotes/notes/add-support-for-proxying-ironic-inspector-via-apache-ea70e9fa1ad04553.yaml b/releasenotes/notes/add-support-for-proxying-ironic-inspector-via-apache-ea70e9fa1ad04553.yaml
new file mode 100644
index 0000000..940c20e
--- /dev/null
+++ b/releasenotes/notes/add-support-for-proxying-ironic-inspector-via-apache-ea70e9fa1ad04553.yaml
@@ -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
diff --git a/templates/ui/tripleo_ui_config.js.erb b/templates/ui/tripleo_ui_config.js.erb
index f179637..cd02798 100644
--- a/templates/ui/tripleo_ui_config.js.erb
+++ b/templates/ui/tripleo_ui_config.js.erb
@@ -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 %>',