Merge "Change worker defaults to ::os_workers"

manifests/wsgi/apache.pp

@@ -55,7 +55,7 @@
 #
 #   [*threads*]
 #     (optional) The number of threads for the vhost.
-#     Defaults to $::processorcount
+#     Defaults to $::os_workers
 #
 #   [*ssl_cert*]
 #   [*ssl_key*]
@@ -91,7 +91,7 @@ class vitrage::wsgi::apache (
   $ssl_crl_path  = undef,
   $ssl_crl       = undef,
   $ssl_certs_dir = undef,
-  $threads       = $::processorcount,
+  $threads       = $::os_workers,
   $priority      = '10',
 ) {
 

releasenotes/notes/os_workers_for_worker_count-071c71584192e3f3.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.

spec/classes/vitrage_api_spec.rb

@@ -112,7 +112,6 @@ describe 'vitrage::api' do
       let (:facts) do
         facts.merge!(OSDefaults.get_facts({
           :fqdn           => 'some.host.tld',
-          :processorcount => 2,
           :concat_basedir => '/var/lib/puppet/concat'
         }))
       end

spec/classes/vitrage_db_postgresql_spec.rb

@@ -30,7 +30,7 @@ describe 'vitrage::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

spec/classes/vitrage_wsgi_apache_spec.rb

@@ -79,7 +79,7 @@ describe 'vitrage::wsgi::apache' do
     context "on #{os}" do
       let (:facts) do
         facts.merge!(OSDefaults.get_facts({
-          :processorcount => 42,
+          :os_workers     => 8,
           :concat_basedir => '/var/lib/puppet/concat',
           :fqdn           => 'some.host.tld'
         }))