summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-11 20:40:46 +0000
committerGerrit Code Review <review@openstack.org>2016-02-11 20:40:46 +0000
commit83ce6fc522137af793142147821a3f7f94fb4a39 (patch)
treeb5ef0a404166a0cbf5716fbc5b3964019b73856d
parent86d9064317ff6ae1a50bfbebd146d14370dad57b (diff)
parenteb62088ddd6055177554f873168b2a7db0158a57 (diff)
Merge "Enable X-Forwarded-Proto header for keystone admin endpoint"
-rw-r--r--manifests/loadbalancer.pp4
1 files changed, 4 insertions, 0 deletions
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index a37ecff..7b8479d 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -834,6 +834,10 @@ class tripleo::loadbalancer (
haproxy::listen { 'keystone_admin':
bind => $keystone_admin_bind_opts,
collect_exported => false,
+ mode => 'http', # Needed for http-request option
+ options => {
+ 'http-request' => ['set-header X-Forwarded-Proto https if { ssl_fc }'],
+ },
}
haproxy::balancermember { 'keystone_admin':
listening_service => 'keystone_admin',