summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-17 09:25:04 +0000
committerGerrit Code Review <review@openstack.org>2016-02-17 09:25:04 +0000
commitaa6a6cecc257f78a3e064a449f618ff6eecdef36 (patch)
treecf1a9b1e090eb76699de706b4f526995cc4154bf /manifests
parent83ce6fc522137af793142147821a3f7f94fb4a39 (diff)
parent55b24a306d8ab6f71fa2b82f49d928dc72f8a3b0 (diff)
Merge "Handle redirects for Horizon"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/loadbalancer.pp11
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,
}