From 3ff730bc6f5926a4c5db1a4b9669e0baec91b2ce Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 9 Jun 2020 08:28:18 -0600 Subject: [PATCH] Fix error when display_ok_hosts is false If display_ok_hosts is false, we were returning None but the function is expected to return a tuple. So let's return a tuple of (None, None) and check if we don't have a line then return. Change-Id: Iaf2f83a8f13bcb9cf0c37acff627a456005057de --- tripleo_ansible/ansible_plugins/callback/tripleo_dense.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tripleo_ansible/ansible_plugins/callback/tripleo_dense.py b/tripleo_ansible/ansible_plugins/callback/tripleo_dense.py index 4f7a9b790..5235eae66 100644 --- a/tripleo_ansible/ansible_plugins/callback/tripleo_dense.py +++ b/tripleo_ansible/ansible_plugins/callback/tripleo_dense.py @@ -73,7 +73,7 @@ class CallbackModule(DefaultCallback): color = C.COLOR_CHANGED else: if not self.display_ok_hosts: - return + return (None, None) line.append(self._get_state('OK')) line.append(self._get_task_name(result)) line.append(host_str) @@ -147,6 +147,8 @@ class CallbackModule(DefaultCallback): if isinstance(result._task, TaskInclude): return (line, color) = self._get_item_line(result, item=True) + if not line: + return self._handle_warnings(result._result) if result._task.loop and 'results' in result._result: self._process_items(result) @@ -202,6 +204,8 @@ class CallbackModule(DefaultCallback): if isinstance(result._task, TaskInclude): return (line, color) = self._get_item_line(result) + if not line: + return self._handle_warnings(result._result) if result._task.loop and 'results' in result._result: self._process_items(result)