openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix regression in removing containers in container-puppet.py"

This commit is contained in:
Zuul 2019-11-20 11:58:22 +00:00 committed by Gerrit Code Review
parent fb0dbebf9b 03f26d045e
commit 2f94ce67ef
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/container-puppet.py
View File

@ -142,21 +142,25 @@ def rm_container(name):
if stderr: if stderr:
LOG.debug(stderr) LOG.debug(stderr)
def rm_process_call(rm_cli_cmd):
stdout, stderr, retval = local_subprocess_call(
cmd=rm_cli_cmd)
if stdout:
LOG.debug(stdout)
if stderr and 'Error response from daemon' in stderr:
LOG.debug(stderr)
LOG.info('Removing container: %s' % name) LOG.info('Removing container: %s' % name)
rm_cli_cmd = [CLI_CMD, 'rm'] rm_cli_cmd = [CLI_CMD, 'rm']
rm_cli_cmd.append(name)
rm_process_call(rm_cli_cmd)
# --storage is used as a mitigation of # --storage is used as a mitigation of
# https://github.com/containers/libpod/issues/3906 # https://github.com/containers/libpod/issues/3906
# Also look https://bugzilla.redhat.com/show_bug.cgi?id=1747885 # Also look https://bugzilla.redhat.com/show_bug.cgi?id=1747885
if CONTAINER_CLI == 'podman': if CONTAINER_CLI == 'podman':
rm_cli_cmd.extend(['--storage']) rm_storage_cli_cmd = [CLI_CMD, 'rm', '--storage']
rm_cli_cmd.append(name) rm_storage_cli_cmd.append(name)
stdout, stderr, retval = local_subprocess_call( rm_process_call(rm_storage_cli_cmd)
cmd=rm_cli_cmd
)
if stdout:
LOG.debug(stdout)
if stderr and 'Error response from daemon' in stderr:
LOG.debug(stderr)
def mp_puppet_config(*args): def mp_puppet_config(*args):