From 2c79a6ba0a75b779000248e1cc35a425a91ef760 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 16 Jun 2020 13:46:21 -0400 Subject: [PATCH] Add tripleo_states to default callback whitelist tripleo_states will be a useful callback to print out informations about a deployment state (e.g. if a node failed but was ignored because of max_failed_percentage). Change-Id: I82f4945bf1178fad1ff511c994518008f308d12e (cherry picked from commit c1dad1ced1fffe3c8e8ec727fc81ccb601b61b8a) --- tripleo_common/actions/ansible.py | 6 ++++-- tripleo_common/tests/actions/test_ansible.py | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tripleo_common/actions/ansible.py b/tripleo_common/actions/ansible.py index 9d1fb9dce..881133dc3 100644 --- a/tripleo_common/actions/ansible.py +++ b/tripleo_common/actions/ansible.py @@ -69,7 +69,8 @@ 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', 'profile_tasks', + 'tripleo_states']) action_plugins_path = ( '~/.ansible/plugins/action:' '/usr/share/ansible/plugins/action:' @@ -619,7 +620,8 @@ 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_CALLBACK_WHITELIST': + 'tripleo,profile_tasks,tripleo_states', 'ANSIBLE_STDOUT_CALLBACK': 'tripleo', '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 150638173..e8b4bfc1c 100644 --- a/tripleo_common/tests/actions/test_ansible.py +++ b/tripleo_common/tests/actions/test_ansible.py @@ -113,7 +113,8 @@ 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_CALLBACK_WHITELIST': + 'tripleo,profile_tasks,tripleo_states', 'ANSIBLE_STDOUT_CALLBACK': 'tripleo', 'PROFILE_TASKS_TASK_OUTPUT_LIMIT': '20', } @@ -153,7 +154,8 @@ 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_CALLBACK_WHITELIST': + 'tripleo,profile_tasks,tripleo_states', 'ANSIBLE_STDOUT_CALLBACK': 'tripleo', 'PROFILE_TASKS_TASK_OUTPUT_LIMIT': '20', } @@ -193,7 +195,8 @@ 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_CALLBACK_WHITELIST': + 'tripleo,profile_tasks,tripleo_states', 'ANSIBLE_STDOUT_CALLBACK': 'tripleo', 'PROFILE_TASKS_TASK_OUTPUT_LIMIT': '20', }