From 8bae698dcc110f3ded9b9e35eb9d0b8e1f7594b0 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 8 May 2020 15:59:40 -0600 Subject: [PATCH] Switch to tripleo_dense Change-Id: Iff8eec43bd73bc6486f56e741e740869d1b8acbb Depends-On: https://review.opendev.org/#/c/726479/ (cherry picked from commit 0186702a41c8a917013931a4dd2a1164777380fb) --- tripleo_common/actions/ansible.py | 8 ++++---- tripleo_common/tests/actions/test_ansible.py | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tripleo_common/actions/ansible.py b/tripleo_common/actions/ansible.py index 881133dc3..05df25a80 100644 --- a/tripleo_common/actions/ansible.py +++ b/tripleo_common/actions/ansible.py @@ -69,7 +69,7 @@ def write_default_ansible_cfg(work_dir, '{}/callback_plugins'.format( constants.DEFAULT_VALIDATIONS_BASEDIR, constants.DEFAULT_VALIDATIONS_LEGACY_BASEDIR)) - callbacks_whitelist = ','.join(['tripleo', 'profile_tasks', + callbacks_whitelist = ','.join(['tripleo_dense', 'tripleo_profile_tasks', 'tripleo_states']) action_plugins_path = ( '~/.ansible/plugins/action:' @@ -107,7 +107,7 @@ def write_default_ansible_cfg(work_dir, config.set('defaults', 'library', modules_path) config.set('defaults', 'callback_plugins', callbacks_path) config.set('defaults', 'callback_whitelist', callbacks_whitelist) - config.set('defaults', 'stdout_callback', 'tripleo') + config.set('defaults', 'stdout_callback', 'tripleo_dense') config.set('defaults', 'action_plugins', action_plugins_path) config.set('defaults', 'lookup_plugins', lookups_path) config.set('defaults', 'filter_plugins', filter_plugins_path) @@ -621,8 +621,8 @@ class AnsiblePlaybookAction(base.TripleOAction): # the whitelist could be collected from multiple # arguments if we find a use case for it 'ANSIBLE_CALLBACK_WHITELIST': - 'tripleo,profile_tasks,tripleo_states', - 'ANSIBLE_STDOUT_CALLBACK': 'tripleo', + 'tripleo_dense,tripleo_profile_tasks,tripleo_states', + 'ANSIBLE_STDOUT_CALLBACK': 'tripleo_dense', 'PROFILE_TASKS_TASK_OUTPUT_LIMIT': six.text_type(self.profile_tasks_limit), }) diff --git a/tripleo_common/tests/actions/test_ansible.py b/tripleo_common/tests/actions/test_ansible.py index e8b4bfc1c..f9f3145a6 100644 --- a/tripleo_common/tests/actions/test_ansible.py +++ b/tripleo_common/tests/actions/test_ansible.py @@ -114,8 +114,8 @@ class AnsiblePlaybookActionTest(base.TestCase): 'ANSIBLE_LOCAL_TEMP': action.work_dir, 'ANSIBLE_CONFIG': ansible_config_path, 'ANSIBLE_CALLBACK_WHITELIST': - 'tripleo,profile_tasks,tripleo_states', - 'ANSIBLE_STDOUT_CALLBACK': 'tripleo', + 'tripleo_dense,tripleo_profile_tasks,tripleo_states', + 'ANSIBLE_STDOUT_CALLBACK': 'tripleo_dense', 'PROFILE_TASKS_TASK_OUTPUT_LIMIT': '20', } python_version = sys.version_info.major @@ -155,8 +155,8 @@ class AnsiblePlaybookActionTest(base.TestCase): 'ANSIBLE_LOCAL_TEMP': action.work_dir, 'ANSIBLE_CONFIG': ansible_config_path, 'ANSIBLE_CALLBACK_WHITELIST': - 'tripleo,profile_tasks,tripleo_states', - 'ANSIBLE_STDOUT_CALLBACK': 'tripleo', + 'tripleo_dense,tripleo_profile_tasks,tripleo_states', + 'ANSIBLE_STDOUT_CALLBACK': 'tripleo_dense', 'PROFILE_TASKS_TASK_OUTPUT_LIMIT': '20', } python_version = sys.version_info.major @@ -196,8 +196,8 @@ class AnsiblePlaybookActionTest(base.TestCase): 'ANSIBLE_LOCAL_TEMP': action.work_dir, 'ANSIBLE_CONFIG': ansible_config_path, 'ANSIBLE_CALLBACK_WHITELIST': - 'tripleo,profile_tasks,tripleo_states', - 'ANSIBLE_STDOUT_CALLBACK': 'tripleo', + 'tripleo_dense,tripleo_profile_tasks,tripleo_states', + 'ANSIBLE_STDOUT_CALLBACK': 'tripleo_dense', 'PROFILE_TASKS_TASK_OUTPUT_LIMIT': '20', } python_version = sys.version_info.major