diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-01-05 16:54:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-01-05 16:54:22 +0000 |
| commit | 82d07cd628968fd54fe8f1076fd8c47880d51866 (patch) | |
| tree | ef7f20a170119aee2a7294c9d96adb65958e38e3 | |
| parent | b5a032e6e9cb6b0d952822b39c7341d929045cfc (diff) | |
| parent | 380ce02f8731d46e8a5ebf2fe7d68171ae9890ec (diff) | |
Merge "Enable X-Forwarded-Proto header for Heat and Nova"
| -rw-r--r-- | manifests/loadbalancer.pp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp index 6820459..f514835 100644 --- a/manifests/loadbalancer.pp +++ b/manifests/loadbalancer.pp @@ -618,6 +618,7 @@ class tripleo::loadbalancer ( } $heat_options = { 'rsprep' => "^Location:\\ http://${public_virtual_ip}(.*) Location:\\ https://${public_virtual_ip}\\1", + 'http-request' => ['set-header X-Forwarded-Proto https if { ssl_fc }'], } $heat_cw_bind_opts = { "${heat_api_vip}:8003" => [], @@ -827,6 +828,10 @@ class tripleo::loadbalancer ( haproxy::listen { 'nova_osapi': bind => $nova_osapi_bind_opts, collect_exported => false, + mode => 'http', + options => { + 'http-request' => ['set-header X-Forwarded-Proto https if { ssl_fc }'], + }, } haproxy::balancermember { 'nova_osapi': listening_service => 'nova_osapi', |