Merge "image_uploader: switch stdout_callback to tripleo_dense" into stable/ussuri
This commit is contained in:
commit
3e1455ecab
|
@ -536,7 +536,7 @@ class BaseImageUploader(object):
|
||||||
extra_env_variables=dict(os.environ),
|
extra_env_variables=dict(os.environ),
|
||||||
override_ansible_cfg=(
|
override_ansible_cfg=(
|
||||||
"[defaults]\n"
|
"[defaults]\n"
|
||||||
"stdout_callback=yaml\n"
|
"stdout_callback=tripleo_dense\n"
|
||||||
"log_path=%s\n" % log_f
|
"log_path=%s\n" % log_f
|
||||||
)
|
)
|
||||||
).run(None)
|
).run(None)
|
||||||
|
|
|
@ -1235,7 +1235,7 @@ class TestSkopeoImageUploader(base.TestCase):
|
||||||
extra_env_variables=mock.ANY,
|
extra_env_variables=mock.ANY,
|
||||||
override_ansible_cfg=(
|
override_ansible_cfg=(
|
||||||
"[defaults]\n"
|
"[defaults]\n"
|
||||||
"stdout_callback=yaml\n"
|
"stdout_callback=tripleo_dense\n"
|
||||||
"log_path=%s/tripleo-container-image-prepare-ansible.log\n"
|
"log_path=%s/tripleo-container-image-prepare-ansible.log\n"
|
||||||
% os.path.dirname(logfile.name)
|
% os.path.dirname(logfile.name)
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue