aboutsummaryrefslogtreecommitdiffstats
path: root/docker/docker-puppet.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-13 14:00:15 +0000
committerGerrit Code Review <review@openstack.org>2017-04-13 14:00:15 +0000
commit8391468d16d9c16a91c7b569789402fdcbda6753 (patch)
tree3e4fbe810c133c2f41ba650b761747e7a3cfe1b8 /docker/docker-puppet.py
parentb07dc6ba194fe3bac8fd49e2250559d1dde25f4b (diff)
parent2eddc12be70c98bc9d79afd6b8effef0e4ebfe15 (diff)
Merge "Do not log errors on non-existing container"
Diffstat (limited to 'docker/docker-puppet.py')
-rwxr-xr-xdocker/docker-puppet.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py
index 5c68b08..909a2c8 100755
--- a/docker/docker-puppet.py
+++ b/docker/docker-puppet.py
@@ -61,7 +61,10 @@ def rm_container(name):
stderr=subprocess.PIPE)
cmd_stdout, cmd_stderr = subproc.communicate()
print(cmd_stdout)
- print(cmd_stderr)
+ if cmd_stderr and \
+ cmd_stderr != 'Error response from daemon: ' \
+ 'No such container: {}\n'.format(name):
+ print(cmd_stderr)
process_count = int(os.environ.get('PROCESS_COUNT',
multiprocessing.cpu_count()))