Merge "Handle redirects for Horizon"

1 files changed, 8 insertions, 3 deletions

diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index 7b8479d..9e8c3b6 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -758,11 +758,18 @@ class tripleo::loadbalancer (
       "${horizon_vip}:80" => $haproxy_listen_bind_param,
       "${public_virtual_ip}:443" => union($haproxy_listen_bind_param, ['ssl', 'crt', $horizon_bind_certificate]),
     }
+    $horizon_options = {
+      'cookie' => 'SERVERID insert indirect nocache',
+      'rsprep' => '^Location:\ http://(.*) Location:\ https://\1',
+    }
   } else {
     $horizon_bind_opts = {
       "${horizon_vip}:80" => $haproxy_listen_bind_param,
       "${public_virtual_ip}:80" => $haproxy_listen_bind_param,
     }
+    $horizon_options = {
+      'cookie' => 'SERVERID insert indirect nocache',
+    }
   }
 
   $ironic_api_vip = hiera('ironic_api_vip', $controller_virtual_ip)
@@ -1135,9 +1142,7 @@ class tripleo::loadbalancer (
   if $horizon {
     haproxy::listen { 'horizon':
       bind             => $horizon_bind_opts,
-      options          => {
-        'cookie' => 'SERVERID insert indirect nocache',
-      },
+      options          => $horizon_options,
       mode             => 'http',
       collect_exported => false,
     }