openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Podman 1.4.1 drops json-file in favor of k8s-file" into stable/stein

This commit is contained in:
Zuul 2019-10-16 17:03:13 +00:00 committed by Gerrit Code Review
parent 471a7922f6 810fe06764
commit d9c99432bd
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

@ -430,7 +430,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',
@ -450,7 +449,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)