Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add NeutronDnsDomain heat option, undercloud fix"
[apex-tripleo-heat-templates.git]
/
docker
/
docker-puppet.py
diff --git
a/docker/docker-puppet.py
b/docker/docker-puppet.py
index
5c68b08
..
909a2c8
100755
(executable)
--- 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)
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()))
process_count = int(os.environ.get('PROCESS_COUNT',
multiprocessing.cpu_count()))