openstack/tripleo-heat-templates
Code Issues Proposed changes

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

Browse Source 
This updates the pull function here so that it matches
how paunch also handle's images, only pulling them if
the existing image doesn't already exist on the host.

Change-Id: I90ea41ccdfdb0b9206a63901554d002a5ec0fd3a
This commit is contained in:
Dan Prince 2018-03-08 12:18:06 -05:00
parent b615b3bb93
commit a28892df4f
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): 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 retval = -1
count = 0 count = 0
log.info('Pulling image: %s' % name)
while retval != 0: while retval != 0:
count += 1 count += 1
subproc = subprocess.Popen(['/usr/bin/docker', 'pull', name], subproc = subprocess.Popen(['/usr/bin/docker', 'pull', name],