From c99015249dd30cdca7f7d7ff0ccde4a455bf7407 Mon Sep 17 00:00:00 2001 From: Luke Short Date: Fri, 17 Jan 2020 16:53:18 -0500 Subject: [PATCH] Dynamically set the number of Ansible forks. Because our usage of Ansible is CPU-bound, the recommended value is 10 x CPU_CORES. Conflicts: tripleo_common/actions/ansible.py tripleo_common/tests/actions/test_ansible.py Change-Id: If6d2b22e20c66e5ebdef952746c8aba7c2d54537 Signed-off-by: Luke Short (cherry picked from commit 87d45ac42c3346cf8c295bc0ae798ae4c489be7f) (cherry picked from commit 40b9c183cc0fb709121b69518243b90a5ace64bd) (cherry picked from commit ca863c590d6d17ac343f4e26c1b05dcf5752962e) (cherry picked from commit 16d0418333ae4693085869368262ef655cf389c0) --- tripleo_common/actions/ansible.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tripleo_common/actions/ansible.py b/tripleo_common/actions/ansible.py index c159c98df..73e4f3872 100644 --- a/tripleo_common/actions/ansible.py +++ b/tripleo_common/actions/ansible.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. import json +import multiprocessing import os import shutil import six @@ -44,7 +45,7 @@ def write_default_ansible_cfg(work_dir, config.set('defaults', 'callback_whitelist', callbacks_whitelist) # suppress tasks if all hosts skip, was previously full_skip callback config.set('defaults', 'display_skipped_hosts', 'no') - config.set('defaults', 'forks', '25') + config.set('defaults', 'forks', str(multiprocessing.cpu_count() * 10)) config.set('defaults', 'timeout', '30') config.set('defaults', 'gather_timeout', '30')