diff options
| author | Mark Goddard <mark@stackhpc.com> | 2020-01-28 10:52:43 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-01-28 10:52:43 +0000 |
| commit | fd1db6cd89a03114c3d8db1b7a7ae5e7498b3d0a (patch) | |
| tree | 50da5888d422526aa8d06f8390a9e99e6301f580 /kolla | |
| parent | fa2e1304362d3b81b9903b77d180aa2eb3f1af8b (diff) | |
| download | kolla-fd1db6cd89a03114c3d8db1b7a7ae5e7498b3d0a.tar.gz kolla-fd1db6cd89a03114c3d8db1b7a7ae5e7498b3d0a.zip | |
Reduce duplication in kolla.image.build.run()
Small refactor, now that all call paths use the same methods.
Change-Id: I2cd8d3997eec171db043c7042e42174c5ba8c298
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/image/build.py | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index a6cc4719e..effae431a 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -1388,10 +1388,6 @@ class KollaWorker(object): Return a list of Queues that have been organized into a hierarchy based on dependencies """ - self.build_image_list() - self.find_parents() - self.filter_images() - queue = six.moves.queue.Queue() for image in self.images: @@ -1431,12 +1427,11 @@ def run_build(): kolla.setup_working_dir() kolla.find_dockerfiles() kolla.create_dockerfiles() + kolla.build_image_list() + kolla.find_parents() + kolla.filter_images() if conf.template_only: - kolla.build_image_list() - kolla.find_parents() - kolla.filter_images() - for image in kolla.images: if image.status == STATUS_MATCHED: continue @@ -1451,23 +1446,14 @@ def run_build(): kolla.set_time() if conf.save_dependency: - kolla.build_image_list() - kolla.find_parents() - kolla.filter_images() kolla.save_dependency(conf.save_dependency) LOG.info('Docker images dependency are saved in %s', conf.save_dependency) return if conf.list_images: - kolla.build_image_list() - kolla.find_parents() - kolla.filter_images() kolla.list_images() return if conf.list_dependencies: - kolla.build_image_list() - kolla.find_parents() - kolla.filter_images() kolla.list_dependencies() return |