openstack
/
fuel-library
Code Issues Proposed changes

Enable proxy headers parsing 

As cinder is placed behind the proxy we need to enable
proxy headers parsing, so cinder is aware about about
protocol used to connect to endpoint.

Change-Id: If68de7d52617803b379ed564f07ed6c947315dbd
Closes-Bug: #1665361
This commit is contained in:
Mykyta Karpin 2017-02-17 18:02:49 +02:00
parent 7f81f3aea2
commit fcf9c5cdf9
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
deployment/puppet/openstack_tasks/manifests/openstack_cinder/openstack_cinder.pp
View File

@ -169,20 +169,21 @@ class openstack_tasks::openstack_cinder::openstack_cinder {
}
class { 'cinder::api':
os_region_name => $region,
bind_host => $bind_host,
ratelimits => hiera('cinder_rate_limits'),
service_workers => $service_workers,
privileged_user => true,
os_privileged_user_password => $cinder_user_password,
os_privileged_user_tenant => $keystone_tenant,
os_privileged_user_auth_url => $privileged_auth_uri,
os_privileged_user_name => $keystone_user,
keymgr_encryption_auth_url => $keymgr_encryption_auth_url,
nova_catalog_admin_info => 'compute:nova:adminURL',
nova_catalog_info => 'compute:nova:internalURL',
sync_db => $primary_controller,
default_volume_type => $default_volume_type,
os_region_name => $region,
bind_host => $bind_host,
ratelimits => hiera('cinder_rate_limits'),
service_workers => $service_workers,
privileged_user => true,
os_privileged_user_password => $cinder_user_password,
os_privileged_user_tenant => $keystone_tenant,
os_privileged_user_auth_url => $privileged_auth_uri,
os_privileged_user_name => $keystone_user,
keymgr_encryption_auth_url => $keymgr_encryption_auth_url,
nova_catalog_admin_info => 'compute:nova:adminURL',
nova_catalog_info => 'compute:nova:internalURL',
sync_db => $primary_controller,
default_volume_type => $default_volume_type,
enable_proxy_headers_parsing => true,
}
class { 'cinder::scheduler': }

3
tests/noop/spec/hosts/openstack-cinder/openstack-cinder_spec.rb
View File

@ -110,7 +110,8 @@ describe manifest do
let(:default_volume_type) { Noop.puppet_function 'pick', cinder_hash['default_volume_type'], facts[:os_service_default] }
it { should contain_class('cinder::api').with(
'default_volume_type' => default_volume_type,
'default_volume_type' => default_volume_type,
'enable_proxy_headers_parsing' => true,
)}
it 'should declare ::cinder class with correct database_max_* parameters' do