openstack/tripleo-heat-templates
Code Issues Proposed changes

Podman 1.4.1 drops json-file in favor of k8s-file

Browse Source 
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
This commit is contained in:
Cédric Jeanneret 2019-06-19 07:43:02 +02:00
parent d48275a3f1
commit 55e1eac892
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/container-puppet.py
View File

@ -408,7 +408,6 @@ def mp_puppet_config(*args):
'--env', 'NO_ARCHIVE=%s' % os.environ.get('NO_ARCHIVE', ''), '--env', 'NO_ARCHIVE=%s' % os.environ.get('NO_ARCHIVE', ''),
'--env', 'STEP=%s' % os.environ.get('STEP', '6'), '--env', 'STEP=%s' % os.environ.get('STEP', '6'),
'--env', 'NET_HOST=%s' % os.environ.get('NET_HOST', 'false'), '--env', 'NET_HOST=%s' % os.environ.get('NET_HOST', 'false'),
'--log-driver', 'json-file',
'--volume', '/etc/localtime:/etc/localtime:ro', '--volume', '/etc/localtime:/etc/localtime:ro',
'--volume', '%s:/etc/config.pp:ro' % tmp_man.name, '--volume', '%s:/etc/config.pp:ro' % tmp_man.name,
'--volume', '/etc/puppet/:/tmp/puppet-etc/:ro', '--volume', '/etc/puppet/:/tmp/puppet-etc/:ro',
@ -425,7 +424,8 @@ def mp_puppet_config(*args):
if container_cli == 'podman': if container_cli == 'podman':
log_path = os.path.join(container_log_stdout_path, uname) 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] 'path=%s.log' % log_path]
common_dcmd.extend(logging) common_dcmd.extend(logging)