Merge "Proxy API endpoints that UI uses"

1 files changed, 93 insertions, 34 deletions

diff --git a/manifests/ui.pp b/manifests/ui.pp
index 27e3e50..7b87397 100644
--- a/manifests/ui.pp
+++ b/manifests/ui.pp
@@ -31,37 +31,53 @@
 #  The port on which the UI is listening.
 #  Defaults to 3000
 #
-# [*keystone_url*]
-#  The keystone service url
-#  Defaults to hiera('keystone::endpoint::public_url')
+# [*endpoint_proxy_keystone*]
+#  The keystone proxy endpoint url
+#  Defaults to undef
 #
-# [*heat_url*]
-#  The heat service url
-#  Defaults to hiera('heat::keystone::auth::public_url')
+# [*endpoint_config_keystone*]
+#  The keystone config endpoint url
+#  Defaults to undef
 #
-# [*heat_url*]
-#  The heat service url
-#  Defaults to hiera('heat::keystone::auth::public_url')
+# [*endpoint_proxy_heat*]
+#  The heat proxy endpoint url
+#  Defaults to undef
 #
-# [*heat_url*]
-#  The heat service url
-#  Defaults to hiera('heat::keystone::auth::public_url')
+# [*endpoint_config_heat*]
+#  The heat config endpoint url
+#  Defaults to undef
 #
-# [*ironic_url*]
-#  The ironic service url
-#  Defaults to hiera('ironic::keystone::auth::public_url')
+# [*endpoint_proxy_ironic*]
+#  The ironic proxy endpoint url
+#  Defaults to undef
 #
-# [*mistral_url*]
-#  The mistral service url
-#  Defaults to hiera('mistral::keystone::auth::public_url')
+# [*endpoint_config_ironic*]
+#  The ironic config endpoint url
+#  Defaults to undef
 #
-# [*swift_url*]
-#  The swift service url
-#  Defaults to hiera('swift::keystone::auth::public_url')
+# [*endpoint_proxy_mistral*]
+#  The mistral proxy endpoint url
+#  Defaults to undef
 #
-# [*zaqar_websocket_url*]
-#  The zaqar websocket url
-#  Defaults to hiera('zaquar::keystone::auth_websocket::public_url')
+# [*endpoint_config_mistral*]
+#  The mistral config endpoint url
+#  Defaults to undef
+#
+# [*endpoint_proxy_swift*]
+#  The swift proxy endpoint url
+#  Defaults to undef
+#
+# [*endpoint_config_swift*]
+#  The swift config endpoint url
+#  Defaults to undef
+#
+# [*endpoint_proxy_zaqar*]
+#  The zaqar proxy endpoint url
+#  Defaults to undef
+#
+# [*endpoint_config_zaqar*]
+#  The zaqar config endpoint url
+#  Defaults to undf
 #
 # [*zaqar_default_queue*]
 #  The zaqar default queue
@@ -69,18 +85,29 @@
 #  Defaults to 'tripleo'
 #
 class tripleo::ui (
-  $servername          = $::fqdn,
-  $bind_host           = hiera('controller_host'),
-  $ui_port             = 3000,
-  $keystone_url        = hiera('keystone_auth_uri_v2'),
-  $heat_url            = hiera('heat::keystone::auth::public_url', undef),
-  $ironic_url          = hiera('ironic::keystone::auth::public_url', undef),
-  $mistral_url         = hiera('mistral::keystone::auth::public_url', undef),
-  $swift_url           = hiera('swift::keystone::auth::public_url', undef),
-  $zaqar_websocket_url = hiera('zaqar::keystone::auth_websocket::public_url', undef),
-  $zaqar_default_queue = 'tripleo'
+  $servername               = $::fqdn,
+  $bind_host                = hiera('controller_host'),
+  $ui_port                  = 3000,
+  $zaqar_default_queue      = 'tripleo',
+  $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,
+
 ) {
 
+  include ::apache::mod::proxy
+  include ::apache::mod::proxy_http
+  include ::apache::mod::proxy_wstunnel
+
   ::apache::vhost { 'tripleo-ui':
     ensure           => 'present',
     servername       => $servername,
@@ -89,6 +116,38 @@ class tripleo::ui (
     docroot          => '/var/www/openstack-tripleo-ui/dist',
     options          => ['Indexes', 'FollowSymLinks'],
     fallbackresource => '/index.html',
+    proxy_pass       => [
+    {
+      'path' => '/zaqar',
+      'url'  => $endpoint_proxy_zaqar
+    },
+    {
+      'path'         => '/keystone',
+      'url'          => $endpoint_proxy_keystone,
+      'reverse_urls' => $endpoint_proxy_keystone
+    },
+    {
+      'path'         => '/heat',
+      'url'          => $endpoint_proxy_heat,
+      'reverse_urls' => $endpoint_proxy_heat
+    },
+    {
+      'path'         => '/ironic',
+      'url'          => $endpoint_proxy_ironic,
+      'reverse_urls' => $endpoint_proxy_ironic
+    },
+    {
+      'path'         => '/mistral',
+      'url'          => $endpoint_proxy_mistral,
+      'reverse_urls' => $endpoint_proxy_mistral
+    },
+    {
+      'path'         => '/swift',
+      'url'          => $endpoint_proxy_swift,
+      'reverse_urls' => $endpoint_proxy_swift
+    },
+    ],
+
   }
 
   # We already use apache::vhost to generate our own