diff --git a/manifests/api.pp b/manifests/api.pp
index 1d1ad6cd..360742f6 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -58,7 +58,7 @@
 #
 # [*service_workers*]
 #   (optional) Number of cinder-api workers
-#   Defaults to $::processorcount
+#   Defaults to $::os_workers
 #
 # [*package_ensure*]
 #   (optional) The state of the package
@@ -210,7 +210,7 @@ class cinder::api (
   $keymgr_api_class               = $::os_service_default,
   $keymgr_encryption_api_url      = $::os_service_default,
   $keymgr_encryption_auth_url     = $::os_service_default,
-  $service_workers                = $::processorcount,
+  $service_workers                = $::os_workers,
   $package_ensure                 = 'present',
   $bind_host                      = '0.0.0.0',
   $enabled                        = true,
diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index 4f339501..44e23148 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*]
@@ -86,7 +86,7 @@ class cinder::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-2e3b0ae4257dad7b.yaml b/releasenotes/notes/os_workers_for_worker_count-2e3b0ae4257dad7b.yaml
new file mode 100644
index 00000000..5616f0d7
--- /dev/null
+++ b/releasenotes/notes/os_workers_for_worker_count-2e3b0ae4257dad7b.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/cinder_api_spec.rb b/spec/classes/cinder_api_spec.rb
index 9e65ca5a..6455fa4d 100644
--- a/spec/classes/cinder_api_spec.rb
+++ b/spec/classes/cinder_api_spec.rb
@@ -412,7 +412,7 @@ describe 'cinder::api' do
     context "on #{os}" do
       let (:facts) do
         facts.merge(OSDefaults.get_facts({
-          :processorcount => 8,
+          :os_workers     => 8,
           :fqdn           => 'some.host.tld',
           :concat_basedir => '/var/lib/puppet/concat',
         }))
diff --git a/spec/classes/cinder_backup_glusterfs_spec.rb b/spec/classes/cinder_backup_glusterfs_spec.rb
index 11bae72b..9c29765a 100644
--- a/spec/classes/cinder_backup_glusterfs_spec.rb
+++ b/spec/classes/cinder_backup_glusterfs_spec.rb
@@ -59,7 +59,7 @@ describe 'cinder::backup::glusterfs' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       it_configures 'cinder backup with glusterfs'
diff --git a/spec/classes/cinder_backup_google_spec.rb b/spec/classes/cinder_backup_google_spec.rb
index d4612058..57ecc41c 100644
--- a/spec/classes/cinder_backup_google_spec.rb
+++ b/spec/classes/cinder_backup_google_spec.rb
@@ -103,7 +103,7 @@ describe 'cinder::backup::google' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       it_configures 'cinder backup with google cloud storage'
diff --git a/spec/classes/cinder_backup_nfs_spec.rb b/spec/classes/cinder_backup_nfs_spec.rb
index 94dbfdcb..6e2c6498 100644
--- a/spec/classes/cinder_backup_nfs_spec.rb
+++ b/spec/classes/cinder_backup_nfs_spec.rb
@@ -72,7 +72,7 @@ describe 'cinder::backup::nfs' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       it_configures 'cinder backup with nfs'
diff --git a/spec/classes/cinder_backup_posix_spec.rb b/spec/classes/cinder_backup_posix_spec.rb
index bfe34c2c..3be1b62e 100644
--- a/spec/classes/cinder_backup_posix_spec.rb
+++ b/spec/classes/cinder_backup_posix_spec.rb
@@ -68,7 +68,7 @@ describe 'cinder::backup::posix' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       it_configures 'cinder backup with posix'
diff --git a/spec/classes/cinder_backup_spec.rb b/spec/classes/cinder_backup_spec.rb
index c8aae4ec..aeb8923f 100644
--- a/spec/classes/cinder_backup_spec.rb
+++ b/spec/classes/cinder_backup_spec.rb
@@ -89,7 +89,7 @@ describe 'cinder::backup' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       let :platform_params do
diff --git a/spec/classes/cinder_backup_swift_spec.rb b/spec/classes/cinder_backup_swift_spec.rb
index 333f076f..c771ebec 100644
--- a/spec/classes/cinder_backup_swift_spec.rb
+++ b/spec/classes/cinder_backup_swift_spec.rb
@@ -85,7 +85,7 @@ describe 'cinder::backup::swift' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       it_configures 'cinder backup with swift'
diff --git a/spec/classes/cinder_backup_tsm_spec.rb b/spec/classes/cinder_backup_tsm_spec.rb
index 88f17011..e2c9d6d1 100644
--- a/spec/classes/cinder_backup_tsm_spec.rb
+++ b/spec/classes/cinder_backup_tsm_spec.rb
@@ -63,7 +63,7 @@ describe 'cinder::backup::tsm' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       it_configures 'cinder backup with tsm'
diff --git a/spec/classes/cinder_client_spec.rb b/spec/classes/cinder_client_spec.rb
index ec2fd0d9..d01483dc 100644
--- a/spec/classes/cinder_client_spec.rb
+++ b/spec/classes/cinder_client_spec.rb
@@ -32,7 +32,7 @@ describe 'cinder::client' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       it_configures 'cinder client'
diff --git a/spec/classes/cinder_db_postgresql_spec.rb b/spec/classes/cinder_db_postgresql_spec.rb
index d17760bf..c72532f0 100644
--- a/spec/classes/cinder_db_postgresql_spec.rb
+++ b/spec/classes/cinder_db_postgresql_spec.rb
@@ -30,7 +30,7 @@ describe 'cinder::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/cinder_db_sync_spec.rb b/spec/classes/cinder_db_sync_spec.rb
index 2e2cc0e2..813721a7 100644
--- a/spec/classes/cinder_db_sync_spec.rb
+++ b/spec/classes/cinder_db_sync_spec.rb
@@ -40,7 +40,7 @@ describe 'cinder::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/cinder_glance_spec.rb b/spec/classes/cinder_glance_spec.rb
index 8b709f4f..77f84a2d 100644
--- a/spec/classes/cinder_glance_spec.rb
+++ b/spec/classes/cinder_glance_spec.rb
@@ -71,7 +71,7 @@ describe 'cinder::glance' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       it_configures 'cinder with glance'
diff --git a/spec/classes/cinder_logging_spec.rb b/spec/classes/cinder_logging_spec.rb
index 132aad97..68b2c3d9 100644
--- a/spec/classes/cinder_logging_spec.rb
+++ b/spec/classes/cinder_logging_spec.rb
@@ -110,7 +110,7 @@ describe 'cinder::logging' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       it_configures 'cinder-logging'
diff --git a/spec/classes/cinder_quota_spec.rb b/spec/classes/cinder_quota_spec.rb
index d022ea1a..ac7d038a 100644
--- a/spec/classes/cinder_quota_spec.rb
+++ b/spec/classes/cinder_quota_spec.rb
@@ -46,7 +46,7 @@ describe 'cinder::quota' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       it_configures 'cinder quota'
diff --git a/spec/classes/cinder_scheduler_filter_spec.rb b/spec/classes/cinder_scheduler_filter_spec.rb
index 68e2649a..123d578f 100644
--- a/spec/classes/cinder_scheduler_filter_spec.rb
+++ b/spec/classes/cinder_scheduler_filter_spec.rb
@@ -51,7 +51,7 @@ describe 'cinder::scheduler::filter' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       it_configures 'cinder scheduler filter'
diff --git a/spec/classes/cinder_volume_glusterfs_spec.rb b/spec/classes/cinder_volume_glusterfs_spec.rb
index 9fb3bc14..16522cdb 100644
--- a/spec/classes/cinder_volume_glusterfs_spec.rb
+++ b/spec/classes/cinder_volume_glusterfs_spec.rb
@@ -45,7 +45,7 @@ describe 'cinder::volume::glusterfs' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       it_configures 'glusterfs volume driver'
diff --git a/spec/classes/cinder_volume_quobyte_spec.rb b/spec/classes/cinder_volume_quobyte_spec.rb
index d9d8c011..5fe869e6 100644
--- a/spec/classes/cinder_volume_quobyte_spec.rb
+++ b/spec/classes/cinder_volume_quobyte_spec.rb
@@ -29,7 +29,7 @@ describe 'cinder::volume::quobyte' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       it_configures 'quobyte volume driver'
diff --git a/spec/classes/cinder_wsgi_apache_spec.rb b/spec/classes/cinder_wsgi_apache_spec.rb
index 4a1276a5..a1696aae 100644
--- a/spec/classes/cinder_wsgi_apache_spec.rb
+++ b/spec/classes/cinder_wsgi_apache_spec.rb
@@ -79,7 +79,7 @@ describe 'cinder::wsgi::apache' do
     context "on #{os}" do
       let (:facts) do
         facts.merge!(OSDefaults.get_facts({
-          :processorcount => 42,
+          :os_workers     => 42,
           :concat_basedir => '/var/lib/puppet/concat',
           :fqdn           => 'some.host.tld',
         }))
diff --git a/spec/defines/cinder_backend_glusterfs_spec.rb b/spec/defines/cinder_backend_glusterfs_spec.rb
index c400409c..64add740 100644
--- a/spec/defines/cinder_backend_glusterfs_spec.rb
+++ b/spec/defines/cinder_backend_glusterfs_spec.rb
@@ -66,7 +66,7 @@ describe 'cinder::backend::glusterfs' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       it_configures 'glusterfs volume driver'
diff --git a/spec/defines/cinder_backend_quobyte_spec.rb b/spec/defines/cinder_backend_quobyte_spec.rb
index 4a6879c5..c241dc3e 100644
--- a/spec/defines/cinder_backend_quobyte_spec.rb
+++ b/spec/defines/cinder_backend_quobyte_spec.rb
@@ -39,7 +39,7 @@ describe 'cinder::backend::quobyte' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+        facts.merge(OSDefaults.get_facts({:os_workers => 8}))
       end
 
       it_configures 'quobyte volume driver'