aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-22 11:13:41 +0000
committerGerrit Code Review <review@openstack.org>2016-11-22 11:13:41 +0000
commitcd49ce7f92b3c6c8a99ffa455b160fd0373237e8 (patch)
tree62a3c56b9fe028a7e4d418a7b01a9e0c709857ef
parentaf9c77df80accac1f7c78b181c244e32df6b75b8 (diff)
parent255ea29cd425f096a22c000ecdc9e594cacdd36c (diff)
Merge "Use mode 'http' in haproxy for ceilometer, neutron, aodh and gnocchi"
-rw-r--r--manifests/haproxy.pp4
1 files changed, 4 insertions, 0 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 397f563..ededc76 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -786,6 +786,7 @@ class tripleo::haproxy (
service_port => $ports[neutron_api_port],
ip_addresses => hiera('neutron_api_node_ips', $controller_hosts_real),
server_names => hiera('neutron_api_node_names', $controller_hosts_names_real),
+ mode => 'http',
listen_options => {
'http-request' => [
'set-header X-Forwarded-Proto https if { ssl_fc }',
@@ -937,6 +938,7 @@ class tripleo::haproxy (
service_port => $ports[ceilometer_api_port],
ip_addresses => hiera('ceilometer_api_node_ips', $controller_hosts_real),
server_names => hiera('ceilometer_api_node_names', $controller_hosts_names_real),
+ mode => 'http',
listen_options => {
'http-request' => [
'set-header X-Forwarded-Proto https if { ssl_fc }',
@@ -955,6 +957,7 @@ class tripleo::haproxy (
service_port => $ports[aodh_api_port],
ip_addresses => hiera('aodh_api_node_ips', $controller_hosts_real),
server_names => hiera('aodh_api_node_names', $controller_hosts_names_real),
+ mode => 'http',
listen_options => {
'http-request' => [
'set-header X-Forwarded-Proto https if { ssl_fc }',
@@ -1004,6 +1007,7 @@ 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),
+ mode => 'http',
listen_options => {
'http-request' => [
'set-header X-Forwarded-Proto https if { ssl_fc }',