Merge "Change worker defaults to ::os_workers"

manifests/proxy.pp

@@ -25,7 +25,7 @@
 #
 #  [*workers*]
 #    (optional) Number of threads to process requests.
-#    Defaults to the number of processors.
+#    Defaults to $::os_workers.
 #
 #  [*allow_account_management*]
 #    (optional) Rather or not requests through this proxy can create and
@@ -133,7 +133,7 @@ class swift::proxy(
   $proxy_local_net_ip,
   $port                      = '8080',
   $pipeline                  = ['healthcheck', 'cache', 'tempauth', 'proxy-server'],
-  $workers                   = $::processorcount,
+  $workers                   = $::os_workers,
   $allow_account_management  = true,
   $account_autocreate        = true,
   $log_headers               = 'False',

releasenotes/notes/os_workers_for_worker_count-74ffbcb7c18c00e9.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/swift_proxy_cache_spec.rb

@@ -6,7 +6,7 @@ describe 'swift::proxy::cache' do
     {
       :operatingsystem => 'Ubuntu',
       :osfamily        => 'Debian',
-      :processorcount  => 1
+      :os_workers      => 1,
     }
   end
 

spec/classes/swift_proxy_spec.rb

@@ -13,7 +13,7 @@ describe 'swift::proxy' do
     OSDefaults.get_facts({
      :operatingsystem => 'Ubuntu',
      :osfamily        => 'Debian',
-     :processorcount  => 1,
+     :os_workers      => 1,
     })
   end
 

spec/classes/swift_ringbuilder_spec.rb

@@ -5,7 +5,7 @@ describe 'swift::ringbuilder' do
     OSDefaults.get_facts({
       :operatingsystem => 'Ubuntu',
       :osfamily        => 'Debian',
-      :processorcount  => 1,
+      :os_workers      => 1,
     })
   end
   describe 'when swift class is not included' do

spec/defines/swift_storage_node_spec.rb

@@ -4,6 +4,7 @@ describe 'swift::storage::node' do
     OSDefaults.get_facts({
       :operatingsystem => 'Ubuntu',
       :osfamily        => 'Debian',
+      :os_workers      => 1,
     })
   end
 

spec/defines/swift_storage_server_spec.rb

@@ -5,6 +5,7 @@ describe 'swift::storage::server' do
     OSDefaults.get_facts({
       :operatingsystem => 'Ubuntu',
       :osfamily        => 'Debian',
+      :os_workers      => 1,
     })
   end