diff --git a/manifests/objectexpirer.pp b/manifests/objectexpirer.pp index 1ef83abe..75727480 100644 --- a/manifests/objectexpirer.pp +++ b/manifests/objectexpirer.pp @@ -101,12 +101,6 @@ # (optional) Log level # Defaults to 'LOG_LOCAL2'. # -# DEPRECATED PARAMETERS -# -# [*auto_create_account_prefix*] -# (optional) Prefix to use when automatically creating accounts. -# Defaults to undef -# class swift::objectexpirer( $manage_service = true, $enabled = true, @@ -128,17 +122,11 @@ class swift::objectexpirer( $cache_tls_keyfile = undef, $log_level = 'INFO', $log_facility = 'LOG_LOCAL2', - # DEPRECATED PARAMETERS - $auto_create_account_prefix = undef, ) inherits swift::params { include swift::deps Swift_object_expirer_config<||> ~> Service['swift-object-expirer'] - if $auto_create_account_prefix != undef { - warning('The auto_create_account_prefix parameter is deprecated. Use the swift::constraints class.') - } - # On Red Hat platforms, it may be defined already, # because it is part of openstack-swift-proxy if $::swift::params::object_expirer_package_name != $::swift::params::proxy_package_name { @@ -180,7 +168,6 @@ class swift::objectexpirer( swift_object_expirer_config { 'pipeline:main/pipeline': value => join($pipeline, ' '); - 'object-expirer/auto_create_account_prefix': value => pick($auto_create_account_prefix, $facts['os_service_default']); 'object-expirer/concurrency': value => $concurrency; 'object-expirer/expiring_objects_account_name': value => $expiring_objects_account_name; 'object-expirer/interval': value => $interval; diff --git a/releasenotes/notes/remove-object-expirer-auto_create_account_prefix-f7c7dbc3a764791b.yaml b/releasenotes/notes/remove-object-expirer-auto_create_account_prefix-f7c7dbc3a764791b.yaml new file mode 100644 index 00000000..8dcca15d --- /dev/null +++ b/releasenotes/notes/remove-object-expirer-auto_create_account_prefix-f7c7dbc3a764791b.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The ``swift::objectexpirer::auto_create_account_prefix`` parameter has + been removed. diff --git a/spec/classes/swift_objectexpirer_spec.rb b/spec/classes/swift_objectexpirer_spec.rb index 892567b2..80838330 100644 --- a/spec/classes/swift_objectexpirer_spec.rb +++ b/spec/classes/swift_objectexpirer_spec.rb @@ -7,7 +7,6 @@ describe 'swift::objectexpirer' do :enabled => true, :package_ensure => 'present', :pipeline => ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'], - :auto_create_account_prefix => '', :concurrency => '', :expiring_objects_account_name => '', :interval => '', @@ -38,8 +37,6 @@ describe 'swift::objectexpirer' do it 'configures object-expirer.conf' do is_expected.to contain_swift_object_expirer_config( 'pipeline:main/pipeline').with_value(p[:pipeline].join(' ')) - is_expected.to contain_swift_object_expirer_config( - 'object-expirer/auto_create_account_prefix').with_value(p[:auto_create_account_prefix]) is_expected.to contain_swift_object_expirer_config( 'object-expirer/concurrency').with_value(p[:concurrency]) is_expected.to contain_swift_object_expirer_config(