From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 9 Nov 2016 10:48:44 +0000 (+0000)
Subject: Merge "Pass X-Forwarded-Proto for missing services"
X-Git-Tag: opnfv-6.0.0~491
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f050e6ee9c97a7a14768770663b9357c9bf5b86b;p=apex-puppet-tripleo.git

Merge "Pass X-Forwarded-Proto for missing services"
---

f050e6ee9c97a7a14768770663b9357c9bf5b86b
diff --cc manifests/haproxy.pp
index 644f1fd,28bd896..aa95226
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@@ -964,9 -970,13 +979,14 @@@ class tripleo::haproxy 
        service_port      => $ports[gnocchi_api_port],
        ip_addresses      => hiera('gnocchi_api_node_ips', $controller_hosts_real),
        server_names      => hiera('gnocchi_api_node_names', $controller_hosts_names_real),
+       listen_options    => {
+           'http-request' => [
+             'set-header X-Forwarded-Proto https if { ssl_fc }',
+             'set-header X-Forwarded-Proto http if !{ ssl_fc }'],
+       },
        public_ssl_port   => $ports[gnocchi_api_ssl_port],
        service_network   => $gnocchi_network,
 +      member_options    => union($haproxy_member_options, $internal_tls_member_options),
      }
    }