Merge "Do not hard-code default of [swift-constraints] max_header_size"
This commit is contained in:
@@ -29,8 +29,8 @@
|
||||
#
|
||||
# [*max_header_size*]
|
||||
# (Optional) Max HTTP header size for incoming requests for all swift
|
||||
# services. Recommended size is 32768 for PKI keystone tokens.
|
||||
# Defaults to 8192
|
||||
# services.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# == Dependencies
|
||||
#
|
||||
@@ -48,7 +48,7 @@ class swift(
|
||||
$swift_hash_path_suffix = $::os_service_default,
|
||||
$swift_hash_path_prefix = $::os_service_default,
|
||||
$package_ensure = 'present',
|
||||
$max_header_size = 8192,
|
||||
$max_header_size = $::os_service_default,
|
||||
) {
|
||||
|
||||
include swift::deps
|
||||
|
||||
@@ -25,7 +25,7 @@ describe 'swift' do
|
||||
is_expected.to contain_swift_config(
|
||||
'swift-hash/swift_hash_path_prefix').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_swift_config(
|
||||
'swift-constraints/max_header_size').with_value(8192)
|
||||
'swift-constraints/max_header_size').with_value('<SERVICE DEFAULT>')
|
||||
end
|
||||
|
||||
it {
|
||||
@@ -47,12 +47,12 @@ describe 'swift' do
|
||||
|
||||
context 'with max_header_size' do
|
||||
before do
|
||||
params.merge!({:max_header_size => 16384})
|
||||
params.merge!({:max_header_size => 8192})
|
||||
end
|
||||
|
||||
it 'should configure swift.conf' do
|
||||
is_expected.to contain_swift_config(
|
||||
'swift-constraints/max_header_size').with_value(16384)
|
||||
'swift-constraints/max_header_size').with_value(8192)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user