diff --git a/manifests/orchestrator.pp b/manifests/orchestrator.pp index 1ec438f..67ebf4e 100644 --- a/manifests/orchestrator.pp +++ b/manifests/orchestrator.pp @@ -24,8 +24,6 @@ class cloudkitty::orchestrator ( include cloudkitty::deps - $max_workers_real = pick($::cloudkitty::processor::max_workers, $max_workers) - oslo::coordination{ 'cloudkitty_config': backend_url => $coordination_url, manage_config => false, @@ -33,7 +31,7 @@ class cloudkitty::orchestrator ( cloudkitty_config { 'orchestrator/coordination_url': value => $coordination_url, secret => true; - 'orchestrator/max_workers': value => $max_workers_real; + 'orchestrator/max_workers': value => $max_workers; 'orchestrator/max_threads': value => $max_threads; } } diff --git a/manifests/processor.pp b/manifests/processor.pp index 6e075dd..fa84045 100644 --- a/manifests/processor.pp +++ b/manifests/processor.pp @@ -52,12 +52,6 @@ # (optional) Endpoint URL type # Default to $facts['os_service_default'] # -# DEPRECATED PARAMETERS -# -# [*max_workers*] -# (optional) Number of max workers for processor -# Default to $facts['os_service_default'] -# class cloudkitty::processor ( $package_ensure = 'present', Boolean $manage_service = true, @@ -71,18 +65,11 @@ class cloudkitty::processor ( $auth_section = 'keystone_authtoken', $region_name = $facts['os_service_default'], $interface = $facts['os_service_default'], - # DEPRECATED PARAMETERS - $max_workers = undef, ) { include cloudkitty::deps include cloudkitty::params - if $max_workers != undef { - warning('The max_workers parameter is deprecated. Use the cloudkitty::orchestrator class.') - } - include cloudkitty::orchestrator - package { 'cloudkitty-processor': ensure => $package_ensure, name => $::cloudkitty::params::processor_package_name, diff --git a/releasenotes/notes/remove-processor-max_workers-04b325e400b035b0.yaml b/releasenotes/notes/remove-processor-max_workers-04b325e400b035b0.yaml new file mode 100644 index 0000000..3852bed --- /dev/null +++ b/releasenotes/notes/remove-processor-max_workers-04b325e400b035b0.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``cloudkitty::processor::max_workers`` parameter has been removed. diff --git a/spec/classes/cloudkitty_processor_spec.rb b/spec/classes/cloudkitty_processor_spec.rb index a5d4af0..2457eab 100644 --- a/spec/classes/cloudkitty_processor_spec.rb +++ b/spec/classes/cloudkitty_processor_spec.rb @@ -10,8 +10,8 @@ describe 'cloudkitty::processor' do :wait_periods => '1', :window => '3600', :region_name => 'RegionOne', - :interface => 'publicURL', - :max_workers => '6',} + :interface => 'publicURL' + } end shared_examples_for 'cloudkitty-processor' do @@ -28,7 +28,6 @@ describe 'cloudkitty::processor' do it { is_expected.to contain_cloudkitty_config('collector_gnocchi/auth_section').with_value('keystone_authtoken') } it { is_expected.to contain_cloudkitty_config('collector_gnocchi/region_name').with_value( params[:region_name] ) } it { is_expected.to contain_cloudkitty_config('collector_gnocchi/interface').with_value( params[:interface] ) } - it { is_expected.to contain_cloudkitty_config('orchestrator/max_workers').with_value( params[:max_workers] ) } it 'installs cloudkitty-processor package' do is_expected.to contain_package('cloudkitty-processor').with(