openstack
/
fuel-library
Code Issues Proposed changes

Merge "Enable active connection closing for ceilometer-api"

This commit is contained in:
Jenkins 2016-01-14 13:51:06 +00:00 committed by Gerrit Code Review
parent 13502d08e3 7221bd5ca6
commit 1f459f5565
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/puppet/openstack/manifests/ha/ceilometer.pp
View File

@ -66,6 +66,7 @@ class openstack::ha::ceilometer (
internal_ssl_path => $internal_ssl_path,
require_service => 'ceilometer-api',
haproxy_config_options => {
'option' => ['httplog', 'forceclose'],
'http-request' => 'set-header X-Forwarded-Proto https if { ssl_fc }',
},
}

1
deployment/puppet/openstack/spec/classes/openstack_ha_ceilometer_spec.rb
View File

@ -22,6 +22,7 @@ require 'spec_helper'
'public_ssl_path' => '/var/lib/fuel/haproxy/public_ceilometer.pem',
'require_service' => 'ceilometer-api',
'haproxy_config_options' => {
'option' => ['httplog', 'forceclose'],
'http-request' => 'set-header X-Forwarded-Proto https if { ssl_fc }',
},
)

1
tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-ceilometer_spec.rb
View File

@ -33,6 +33,7 @@ describe manifest do
'public_ssl' => public_ssl_ceilometer,
'require_service' => 'ceilometer-api',
'haproxy_config_options' => {
'option' => ['httplog', 'forceclose'],
'http-request' => 'set-header X-Forwarded-Proto https if { ssl_fc }',
},
)