openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "docker-puppet.py: don't pull if image exists"

This commit is contained in:
Zuul 2018-03-14 19:19:47 +00:00 committed by Gerrit Code Review
parent a197218d60 a28892df4f
commit baa27f1c33
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/docker-puppet.py
View File

@ -59,9 +59,19 @@ def short_hostname():
def pull_image(name):
log.info('Pulling image: %s' % name)
subproc = subprocess.Popen(['/usr/bin/docker', 'inspect', name],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
cmd_stdout, cmd_stderr = subproc.communicate()
retval = subproc.returncode
if retval == 0:
log.info('Image already exists: %s' % name)
return
retval = -1
count = 0
log.info('Pulling image: %s' % name)
while retval != 0:
count += 1
subproc = subprocess.Popen(['/usr/bin/docker', 'pull', name],