diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index bb9a5834..10d461ed 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -50,7 +50,7 @@ # # [*threads*] # (optional) The number of threads for the vhost. -# Defaults to $::processorcount +# Defaults to $::os_workers # # [*ssl_cert*] # [*ssl_key*] @@ -87,7 +87,7 @@ class ironic::wsgi::apache ( $ssl_crl_path = undef, $ssl_crl = undef, $ssl_certs_dir = undef, - $threads = $::processorcount, + $threads = $::os_workers, $priority = '10', ) { diff --git a/releasenotes/notes/os_workers_for_worker_count-24578f84123bd2ea.yaml b/releasenotes/notes/os_workers_for_worker_count-24578f84123bd2ea.yaml new file mode 100644 index 00000000..5616f0d7 --- /dev/null +++ b/releasenotes/notes/os_workers_for_worker_count-24578f84123bd2ea.yaml @@ -0,0 +1,5 @@ +--- +other: + - Parameters that control the number of spawned child processes for + distributing processing have had their default value changed from + ::processorcount to ::os_workers. diff --git a/spec/classes/ironic_api_spec.rb b/spec/classes/ironic_api_spec.rb index 62a7a378..b6012a8b 100644 --- a/spec/classes/ironic_api_spec.rb +++ b/spec/classes/ironic_api_spec.rb @@ -145,7 +145,6 @@ describe 'ironic::api' do :operatingsystemrelease => '8.0', :concat_basedir => '/var/lib/puppet/concat', :fqdn => 'some.host.tld', - :processorcount => 2, }) end @@ -165,7 +164,6 @@ describe 'ironic::api' do :operatingsystemrelease => '7.2', :concat_basedir => '/var/lib/puppet/concat', :fqdn => 'some.host.tld', - :processorcount => 2, }) end diff --git a/spec/classes/ironic_db_postgresql_spec.rb b/spec/classes/ironic_db_postgresql_spec.rb index 0097e02b..116e4681 100644 --- a/spec/classes/ironic_db_postgresql_spec.rb +++ b/spec/classes/ironic_db_postgresql_spec.rb @@ -30,7 +30,7 @@ describe 'ironic::db::postgresql' do context "on #{os}" do let (:facts) do facts.merge(OSDefaults.get_facts({ - :processorcount => 8, + :os_workers => 8, :concat_basedir => '/var/lib/puppet/concat' })) end diff --git a/spec/classes/ironic_db_sync_spec.rb b/spec/classes/ironic_db_sync_spec.rb index 88dd4ffa..0bf7eeeb 100644 --- a/spec/classes/ironic_db_sync_spec.rb +++ b/spec/classes/ironic_db_sync_spec.rb @@ -37,7 +37,7 @@ describe 'ironic::db::sync' do context "on #{os}" do let (:facts) do facts.merge(OSDefaults.get_facts({ - :processorcount => 8, + :os_workers => 8, :concat_basedir => '/var/lib/puppet/concat' })) end diff --git a/spec/classes/ironic_wsgi_apache_spec.rb b/spec/classes/ironic_wsgi_apache_spec.rb index 80394acf..7964424a 100644 --- a/spec/classes/ironic_wsgi_apache_spec.rb +++ b/spec/classes/ironic_wsgi_apache_spec.rb @@ -4,7 +4,7 @@ describe 'ironic::wsgi::apache' do let :global_facts do OSDefaults.get_facts({ - :processorcount => 42, + :os_workers => 8, :concat_basedir => '/var/lib/puppet/concat', :fqdn => 'some.host.tld' })