summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-07 11:14:42 +0000
committerGerrit Code Review <review@openstack.org>2016-08-07 11:14:42 +0000
commitc4360efdc89904f390f6acca30712b025a6c05df (patch)
treec187ddbb2a0ea62a1837cdc65b1e69101b124c8e /manifests
parenta0de84283a427a581d0da7c4a4eb666aec213b9d (diff)
parent9838f8fa3192812a26e32d303fee8be29e7ffae4 (diff)
Merge "Add passing of X-Forwarded-Proto to Glance API endpoint"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/haproxy.pp6
1 files changed, 6 insertions, 0 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 724c037..0a53353 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -602,6 +602,12 @@ class tripleo::haproxy (
ip_addresses => hiera('glance_api_node_ips', $controller_hosts_real),
server_names => $controller_hosts_names_real,
public_ssl_port => $ports[glance_api_ssl_port],
+ mode => 'http',
+ listen_options => {
+ 'http-request' => [
+ 'set-header X-Forwarded-Proto https if { ssl_fc }',
+ 'set-header X-Forwarded-Proto http if !{ ssl_fc }'],
+ },
}
}