From 55e1eac8920c8ecb987bcc6b6edeb723956fd40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Wed, 19 Jun 2019 07:43:02 +0200 Subject: [PATCH] Podman 1.4.1 drops json-file in favor of k8s-file While this new name makes more sense than the "json-file" which wasn't a json, it breaks podman invocations[0] in TripleO. Also, moved the configuration snipped to the podman dedicated block, since docker doesn't have that driver[1]. [0] https://github.com/containers/libpod/issues/3363 [1] https://docs.docker.com/config/containers/logging/configure/ Depends-On: https://review.opendev.org/666223 Change-Id: I3891da45e665727ab6d767514f9d24cb06da6b50 --- common/container-puppet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/container-puppet.py b/common/container-puppet.py index 7ccd1b0663..5df30c3c2d 100755 --- a/common/container-puppet.py +++ b/common/container-puppet.py @@ -408,7 +408,6 @@ def mp_puppet_config(*args): '--env', 'NO_ARCHIVE=%s' % os.environ.get('NO_ARCHIVE', ''), '--env', 'STEP=%s' % os.environ.get('STEP', '6'), '--env', 'NET_HOST=%s' % os.environ.get('NET_HOST', 'false'), - '--log-driver', 'json-file', '--volume', '/etc/localtime:/etc/localtime:ro', '--volume', '%s:/etc/config.pp:ro' % tmp_man.name, '--volume', '/etc/puppet/:/tmp/puppet-etc/:ro', @@ -425,7 +424,8 @@ def mp_puppet_config(*args): if container_cli == 'podman': log_path = os.path.join(container_log_stdout_path, uname) - logging = ['--log-opt', + logging = ['--log-driver', 'k8s-file', + '--log-opt', 'path=%s.log' % log_path] common_dcmd.extend(logging)