From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Wed, 16 Dec 2015 16:56:29 +0000 (+0200)
Subject: Enable X-Forwarded-Proto header for Heat and Nova
X-Git-Tag: opnfv-6.0.0~818^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=380ce02f8731d46e8a5ebf2fe7d68171ae9890ec;p=apex-puppet-tripleo.git

Enable X-Forwarded-Proto header for Heat and Nova

Change-Id: Icd666d9988d14ac1e9581f55589bf95243cc7641
---

diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index c4a317b..d4122ab 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -579,6 +579,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" => [],
@@ -788,6 +789,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',