Browse Source

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

changes/83/748283/1
Zuul 4 weeks ago
committed by Gerrit Code Review
parent
commit
4913408a05
2 changed files with 3 additions and 4 deletions
  1. +1
    -2
      tripleo_common/image/image_uploader.py
  2. +2
    -2
      tripleo_common/tests/image/test_image_uploader.py

+ 1
- 2
tripleo_common/image/image_uploader.py View File

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


+ 2
- 2
tripleo_common/tests/image/test_image_uploader.py View File

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



Loading…
Cancel
Save