Remove deprecated swift::max_header_size
The parameter was deprecated during the past cycle in favor of the new
constraints class[1].
[1] 7d220dd934
Change-Id: I7c291035e4eef39333150629b65abd915976ca79
			
			
This commit is contained in:
		@@ -108,7 +108,7 @@ class swift::constraints(
 | 
			
		||||
    'swift-constraints/max_meta_value_length':      value => $max_meta_value_length;
 | 
			
		||||
    'swift-constraints/max_meta_count':             value => $max_meta_count;
 | 
			
		||||
    'swift-constraints/max_meta_overall_size':      value => $max_meta_overall_size;
 | 
			
		||||
    'swift-constraints/max_header_size':            value => pick($::swift::max_header_size, $max_header_size);
 | 
			
		||||
    'swift-constraints/max_header_size':            value => $max_header_size;
 | 
			
		||||
    'swift-constraints/extra_header_count':         value => $extra_header_count;
 | 
			
		||||
    'swift-constraints/max_object_name_length':     value => $max_object_name_length;
 | 
			
		||||
    'swift-constraints/container_listing_limit':    value => $container_listing_limit;
 | 
			
		||||
 
 | 
			
		||||
@@ -27,13 +27,6 @@
 | 
			
		||||
#   (Optional) The ensure state for the swift package.
 | 
			
		||||
#   Defaults to present.
 | 
			
		||||
#
 | 
			
		||||
# DEPRECATED PARAMETERS
 | 
			
		||||
#
 | 
			
		||||
# [*max_header_size*]
 | 
			
		||||
#   (Optional) Max HTTP header size for incoming requests for all swift
 | 
			
		||||
#   services.
 | 
			
		||||
#   Defaults to undef
 | 
			
		||||
#
 | 
			
		||||
# == Dependencies
 | 
			
		||||
#
 | 
			
		||||
# None
 | 
			
		||||
@@ -50,8 +43,6 @@ class swift(
 | 
			
		||||
  $swift_hash_path_suffix = $facts['os_service_default'],
 | 
			
		||||
  $swift_hash_path_prefix = $facts['os_service_default'],
 | 
			
		||||
  $package_ensure         = 'present',
 | 
			
		||||
  # DEPRECATED PARAMETERS
 | 
			
		||||
  $max_header_size        = undef
 | 
			
		||||
) {
 | 
			
		||||
 | 
			
		||||
  include swift::deps
 | 
			
		||||
@@ -72,9 +63,4 @@ class swift(
 | 
			
		||||
    'swift-hash/swift_hash_path_suffix': value => $swift_hash_path_suffix;
 | 
			
		||||
    'swift-hash/swift_hash_path_prefix': value => $swift_hash_path_prefix;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  if $max_header_size != undef {
 | 
			
		||||
    warning('The swift::max_header_size parameter is deprecated. Use the swift::constraints class.')
 | 
			
		||||
    include swift::constraints
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,4 @@
 | 
			
		||||
---
 | 
			
		||||
upgrade:
 | 
			
		||||
  - |
 | 
			
		||||
    The ``swift::max_header_size`` parameter has been removed.
 | 
			
		||||
@@ -43,17 +43,6 @@ describe 'swift' do
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context 'with max_header_size' do
 | 
			
		||||
      before do
 | 
			
		||||
        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(8192)
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context 'with only swift_hash_path_prefix' do
 | 
			
		||||
      let :params do
 | 
			
		||||
        { :swift_hash_path_prefix => 'string' }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user