From 121615cc1f6f1794581e3f3bb609f955b36f5b8c Mon Sep 17 00:00:00 2001
From: Christian Schwede <cschwede@redhat.com>
Date: Wed, 11 Jan 2017 10:28:50 +0100
Subject: [PATCH] Change storage worker default to ::os_workers

This patch changes the default worker count from 1 to the ::os_workers fact.
::os_workers is based on the number of processors (currently cpu/4) but is
capped at a maximum of 8 worker processors.  This is a much more reasonable
default in general and prevents excessive resource consumption on systems with
a large number of CPUs.

This is a follow up to Ifa4f425091fae81204df68dd536f364efd647e3d

Related-Bug: 1655070
Change-Id: I29fd3d8930f32650549bfbf96478232075a7d0b9
---
 manifests/storage/server.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp
index e8db48bb..c032b03d 100644
--- a/manifests/storage/server.pp
+++ b/manifests/storage/server.pp
@@ -58,7 +58,7 @@
 #   one. Increasing the number of workers may reduce the possibility of slow file
 #   system operations in one request from negatively impacting other requests.
 #   See http://docs.openstack.org/developer/swift/deployment_guide.html#general-service-tuning
-#   Defaults to '1'.
+#   Defaults to $::os_workers.
 #
 # [*allow_versions*]
 #   (optional) Enable/Disable object versioning feature
@@ -147,7 +147,7 @@ define swift::storage::server(
   $pipeline                       = ["${type}-server"],
   $mount_check                    = true,
   $user                           = 'swift',
-  $workers                        = '1',
+  $workers                        = $::os_workers,
   $allow_versions                 = false,
   $replicator_concurrency         = 1,
   $updater_concurrency            = 1,