From 0186702a41c8a917013931a4dd2a1164777380fb 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/ --- tripleo_common/actions/ansible.py | 7 ++++--- tripleo_common/tests/actions/test_ansible.py | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tripleo_common/actions/ansible.py b/tripleo_common/actions/ansible.py index 9a6b644af..4b36d53fa 100644 --- a/tripleo_common/actions/ansible.py +++ b/tripleo_common/actions/ansible.py @@ -61,7 +61,7 @@ def write_default_ansible_cfg(work_dir, '/usr/share/ansible/tripleo-plugins/callback:' '/usr/share/ansible/plugins/callback:' '%s/callback_plugins' % constants.DEFAULT_VALIDATIONS_BASEDIR) - callbacks_whitelist = ','.join(['tripleo', 'profile_tasks']) + callbacks_whitelist = ','.join(['tripleo_dense', 'tripleo_profile_tasks']) action_plugins_path = ( '~/.ansible/plugins/action:' '/usr/share/ansible/plugins/action:' @@ -420,8 +420,9 @@ class AnsiblePlaybookAction(base.TripleOAction): env_variables.update({ # the whitelist could be collected from multiple # arguments if we find a use case for it - 'ANSIBLE_CALLBACK_WHITELIST': 'tripleo,profile_tasks', - 'ANSIBLE_STDOUT_CALLBACK': 'tripleo', + 'ANSIBLE_CALLBACK_WHITELIST': + 'tripleo_dense,tripleo_profile_tasks', + '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 7289cddaf..0a1850d4d 100644 --- a/tripleo_common/tests/actions/test_ansible.py +++ b/tripleo_common/tests/actions/test_ansible.py @@ -71,8 +71,9 @@ class AnsiblePlaybookActionTest(base.TestCase): 'HOME': action.work_dir, 'ANSIBLE_LOCAL_TEMP': action.work_dir, 'ANSIBLE_CONFIG': ansible_config_path, - 'ANSIBLE_CALLBACK_WHITELIST': 'tripleo,profile_tasks', - 'ANSIBLE_STDOUT_CALLBACK': 'tripleo', + 'ANSIBLE_CALLBACK_WHITELIST': + 'tripleo_dense,tripleo_profile_tasks', + 'ANSIBLE_STDOUT_CALLBACK': 'tripleo_dense', 'PROFILE_TASKS_TASK_OUTPUT_LIMIT': '20', } python_version = sys.version_info.major