openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Don't delete failed docker-puppet containers"

This commit is contained in:
Jenkins 2017-05-17 17:13:22 +00:00 committed by Gerrit Code Review
parent 1324f2f1c9 7962dd4d44
commit a482e69d8f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/docker-puppet.py
View File

@ -253,7 +253,9 @@ def mp_puppet_config((config_volume, puppet_tags, manifest, config_image, volume
log.debug(cmd_stderr)
if subproc.returncode != 0:
log.error('Failed running docker-puppet.py for %s' % config_volume)
rm_container('docker-puppet-%s' % config_volume)
else:
# only delete successful runs, for debugging
rm_container('docker-puppet-%s' % config_volume)
return subproc.returncode
# Holds all the information for each process to consume.