openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Restore default log path for image prepare" into stable/ussuri

This commit is contained in:
Zuul 2020-08-26 07:12:46 +00:00 committed by Gerrit Code Review
parent b24e2b7c1b 968dd03487
commit 4913408a05
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tripleo_common/image/image_uploader.py
View File

@ -588,8 +588,7 @@ class BaseImageUploader(object):
else: else:
raise OSError('Log output is not a file.') raise OSError('Log output is not a file.')
except (AttributeError, OSError): except (AttributeError, OSError):
tmp_dir = tempfile.gettempdir() log_f = os.path.join('/var/log', log_name)
log_f = os.path.join(tmp_dir, log_name)
try: try:
LOG.info('Ansible action starting') LOG.info('Ansible action starting')
ansible.AnsiblePlaybookAction( ansible.AnsiblePlaybookAction(

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

@ -1311,8 +1311,8 @@ class TestSkopeoImageUploader(base.TestCase):
override_ansible_cfg=( override_ansible_cfg=(
"[defaults]\n" "[defaults]\n"
"stdout_callback=tripleo_dense\n" "stdout_callback=tripleo_dense\n"
"log_path=%s/tripleo-container-image-prepare-ansible.log\n" "log_path="
% os.path.dirname(logfile.name) "/var/log/tripleo-container-image-prepare-ansible.log\n"
) )
) )