openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "tripleo_container_manage: fail if podman_container returns stderr"

This commit is contained in:
Zuul 2020-05-13 07:08:07 +00:00 committed by Gerrit Code Review
parent 2d4f3b6951 3880fc7690
commit 8e0bb61135
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tripleo_ansible/ansible_plugins/filter/helpers.py
View File

@ -406,9 +406,10 @@ class FilterModule(object):
""" """
failed = [] failed = []
for item in async_results: for item in async_results:
async_result_item = item['create_async_result_item']
try: try:
if item['failed'] or not item['finished']: if (item['failed'] or not item['finished']
async_result_item = item['create_async_result_item'] or async_result_item['stderr'] != ''):
for k, v in async_result_item['container_data'].items(): for k, v in async_result_item['container_data'].items():
failed.append(k) failed.append(k)
except KeyError: except KeyError:

19
tripleo_ansible/tests/plugins/filter/test_helpers.py
View File

@ -839,6 +839,23 @@ class TestHelperFilters(tests_base.TestCase):
"results_file": "/root/.ansible_async/948704694230.17597", "results_file": "/root/.ansible_async/948704694230.17597",
"started": 1 "started": 1
}, },
{
"ansible_job_id": "9487088344230.17597",
"ansible_loop_var": "container_data",
"changed": True,
"create_async_result_item": {
"stderr": "not happy",
"container_data": {
"haproxy_failed": {
"image": "haproxy:latest",
}
}
},
"failed": False,
"finished": 1,
"results_file": "/root/.ansible_async/948704694230.17597",
"started": 1
},
{ {
"ansible_job_id": "948704694230.17597", "ansible_job_id": "948704694230.17597",
"ansible_loop_var": "container_data", "ansible_loop_var": "container_data",
@ -881,7 +898,7 @@ class TestHelperFilters(tests_base.TestCase):
"started": 1 "started": 1
} }
] ]
expected_list = ['memcached', 'mysql'] expected_list = ['haproxy_failed', 'memcached', 'mysql']
result = self.filters.get_failed_containers(data) result = self.filters.get_failed_containers(data)
self.assertEqual(result, expected_list) self.assertEqual(result, expected_list)