openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Use the yaml stdout_callback for better prepare logging"

This commit is contained in:
Zuul 2019-01-29 16:08:52 +00:00 committed by Gerrit Code Review
parent 607a9604a2 2a6ef6a4f9
commit bcccec968b
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleo_common/image/image_uploader.py
View File

@ -243,8 +243,12 @@ class BaseImageUploader(object):
action = ansible.AnsiblePlaybookAction(
playbook=playbook,
work_dir=work_dir,
verbosity=3,
extra_env_variables=dict(os.environ)
verbosity=1,
extra_env_variables=dict(os.environ),
override_ansible_cfg=(
"[defaults]\n"
"stdout_callback=yaml\n"
)
)
result = action.run(None)
log_path = result.get('log_path')

16
tripleo_common/tests/image/test_image_uploader.py
View File

@ -799,8 +799,12 @@ class TestDockerImageUploader(base.TestCase):
mock_ansible.assert_called_once_with(
playbook=playbook,
work_dir=mock.ANY,
verbosity=3,
extra_env_variables=mock.ANY
verbosity=1,
extra_env_variables=mock.ANY,
override_ansible_cfg=(
"[defaults]\n"
"stdout_callback=yaml\n"
)
)
self.dockermock.return_value.tag.assert_not_called()
self.dockermock.return_value.push.assert_called_once_with(
@ -1100,8 +1104,12 @@ class TestSkopeoImageUploader(base.TestCase):
mock_ansible.assert_called_once_with(
playbook=playbook,
work_dir=mock.ANY,
verbosity=3,
extra_env_variables=mock.ANY
verbosity=1,
extra_env_variables=mock.ANY,
override_ansible_cfg=(
"[defaults]\n"
"stdout_callback=yaml\n"
)
)
@mock.patch('tripleo_common.image.image_uploader.'