openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "container-puppet: run podman rm with --storage" into stable/stein

This commit is contained in:
Zuul 2019-09-06 19:08:20 +00:00 committed by Gerrit Code Review
parent 7cd1dca6b7 02e0a4e210
commit 1899678b1b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/container-puppet.py
View File

@ -173,7 +173,14 @@ def rm_container(name):
log.debug(cmd_stderr) log.debug(cmd_stderr)
log.info('Removing container: %s' % name) log.info('Removing container: %s' % name)
subproc = subprocess.Popen([cli_cmd, 'rm', name], rm_cli_cmd = [cli_cmd, 'rm']
# --storage is used as a mitigation of
# https://github.com/containers/libpod/issues/3906
# Also look https://bugzilla.redhat.com/show_bug.cgi?id=1747885
if container_cli == 'podman':
rm_cli_cmd.extend(['--storage'])
rm_cli_cmd.append(name)
subproc = subprocess.Popen(rm_cli_cmd,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
universal_newlines=True) universal_newlines=True)