openstack
/
kolla
Code Issues Proposed changes

Reduce duplication in kolla.image.build.run() 

Small refactor, now that all call paths use the same methods.

Change-Id: I2cd8d3997eec171db043c7042e42174c5ba8c298
This commit is contained in:
Mark Goddard 2020-01-28 10:52:43 +00:00
parent fa2e130436
commit fd1db6cd89
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kolla/image/build.py
View File

@ -1388,10 +1388,6 @@ class KollaWorker(object):
Return a list of Queues that have been organized into a hierarchy Return a list of Queues that have been organized into a hierarchy
based on dependencies based on dependencies
""" """
self.build_image_list()
self.find_parents()
self.filter_images()
queue = six.moves.queue.Queue() queue = six.moves.queue.Queue()
for image in self.images: for image in self.images:
@ -1431,12 +1427,11 @@ def run_build():
kolla.setup_working_dir() kolla.setup_working_dir()
kolla.find_dockerfiles() kolla.find_dockerfiles()
kolla.create_dockerfiles() kolla.create_dockerfiles()
kolla.build_image_list()
kolla.find_parents()
kolla.filter_images()
if conf.template_only: if conf.template_only:
kolla.build_image_list()
kolla.find_parents()
kolla.filter_images()
for image in kolla.images: for image in kolla.images:
if image.status == STATUS_MATCHED: if image.status == STATUS_MATCHED:
continue continue
@ -1451,23 +1446,14 @@ def run_build():
kolla.set_time() kolla.set_time()
if conf.save_dependency: if conf.save_dependency:
kolla.build_image_list()
kolla.find_parents()
kolla.filter_images()
kolla.save_dependency(conf.save_dependency) kolla.save_dependency(conf.save_dependency)
LOG.info('Docker images dependency are saved in %s', LOG.info('Docker images dependency are saved in %s',
conf.save_dependency) conf.save_dependency)
return return
if conf.list_images: if conf.list_images:
kolla.build_image_list()
kolla.find_parents()
kolla.filter_images()
kolla.list_images() kolla.list_images()
return return
if conf.list_dependencies: if conf.list_dependencies:
kolla.build_image_list()
kolla.find_parents()
kolla.filter_images()
kolla.list_dependencies() kolla.list_dependencies()
return return