diff --git a/manifests/init.pp b/manifests/init.pp index 96922eb8..b1c4a682 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -47,8 +47,6 @@ # # $num_pulp_workers:: Number of pulp workers to use # -# $max_tasks_per_pulp_worker:: Number of tasks after which the worker gets restarted -# # $qpid_wcache_page_size:: The size (in KB) of the pages in the write page cache # # $qpid_interface:: The interface qpidd listens to. @@ -138,7 +136,6 @@ String $qpid_hostname = $katello::params::qpid_hostname, Integer[1] $num_pulp_workers = $katello::params::num_pulp_workers, Integer[0] $pulp_worker_timeout = $katello::params::pulp_worker_timeout, - Optional[Integer] $max_tasks_per_pulp_worker = $katello::params::max_tasks_per_pulp_worker, Optional[Stdlib::HTTPUrl] $proxy_url = $katello::params::proxy_url, Optional[Integer[0, 65535]] $proxy_port = $katello::params::proxy_port, Optional[String] $proxy_username = $katello::params::proxy_username, diff --git a/manifests/params.pp b/manifests/params.pp index c96f3245..033c912a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -18,7 +18,6 @@ # Pulp worker settings $num_pulp_workers = min($facts['processorcount'], 8) - $max_tasks_per_pulp_worker = undef # Pulp max speed setting $pulp_max_speed = undef diff --git a/manifests/pulp.pp b/manifests/pulp.pp index c268984f..89f7f82c 100644 --- a/manifests/pulp.pp +++ b/manifests/pulp.pp @@ -12,7 +12,6 @@ Boolean $enable_docker = $katello::enable_docker, Boolean $enable_deb = $katello::enable_deb, Integer[1] $num_workers = $katello::num_pulp_workers, - Optional[Integer] $max_tasks_per_child = $katello::max_tasks_per_pulp_worker, String $messaging_url = "ssl://${katello::qpid_hostname}:5671", String $broker_url = "qpid://${katello::qpid_hostname}:5671", Stdlib::Absolutepath $repo_export_dir = $katello::repo_export_dir, @@ -71,7 +70,6 @@ enable_docker => $enable_docker, enable_ostree => $enable_ostree, num_workers => $num_workers, - max_tasks_per_child => $max_tasks_per_child, enable_parent_node => false, repo_auth => true, puppet_wsgi_processes => 1, diff --git a/spec/classes/katello_pulp_spec.rb b/spec/classes/katello_pulp_spec.rb index 5cacc5fe..a32cf467 100644 --- a/spec/classes/katello_pulp_spec.rb +++ b/spec/classes/katello_pulp_spec.rb @@ -44,7 +44,6 @@ class { '::katello': .with_enable_docker(true) .with_enable_ostree(false) .with_num_workers(1) - .with_max_tasks_per_child(nil) .with_enable_parent_node(false) .with_repo_auth(true) .with_puppet_wsgi_processes(1) @@ -80,8 +79,7 @@ class { '::katello': pulp_db_name => 'pulp_db', pulp_db_username => 'pulp_user', pulp_db_password => 'pulp_pw', - pulp_db_seeds => '192.168.1.1:27017', - max_tasks_per_pulp_worker => 2 + pulp_db_seeds => '192.168.1.1:27017' } EOS end @@ -92,7 +90,6 @@ class { '::katello': .with_db_username('pulp_user') .with_db_password('pulp_pw') .with_db_seeds('192.168.1.1:27017') - .with_max_tasks_per_child(2) end end end