summaryrefslogtreecommitdiffstats
path: root/docker/docker-puppet.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-17 17:13:22 +0000
committerGerrit Code Review <review@openstack.org>2017-05-17 17:13:22 +0000
commita482e69d8fd312f817bee75e0ecae968c7fd5ca4 (patch)
treee32ce1f09b78c2e54f1124e5e22e654b904478b8 /docker/docker-puppet.py
parent1324f2f1c965a0ddf6a71c2075547b90b45306ba (diff)
parent7962dd4d44d06169e7dd3985dd23505561e2c97d (diff)
Merge "Don't delete failed docker-puppet containers"
Diffstat (limited to 'docker/docker-puppet.py')
-rwxr-xr-xdocker/docker-puppet.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py
index f1594d2d..49dd00cd 100755
--- a/docker/docker-puppet.py
+++ b/docker/docker-puppet.py
@@ -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.