diff options
| author | Zuul <zuul@review.opendev.org> | 2019-07-22 14:10:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-07-22 14:10:44 +0000 |
| commit | cd26ef4224c5758ff951843fdebc1774bb74a0b1 (patch) | |
| tree | 6e2881960b9a7868f01923a216e3d54cd01c4093 /kolla | |
| parent | 8b17129bd233c84feb1e8967e1d11dd2fac92ea6 (diff) | |
| parent | 8c3cb6b4d29ac386297af5c1a6d67b1f031df3c8 (diff) | |
| download | kolla-cd26ef4224c5758ff951843fdebc1774bb74a0b1.tar.gz kolla-cd26ef4224c5758ff951843fdebc1774bb74a0b1.zip | |
Merge "Allow building images if parent was skipped"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/image/build.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 71a93ebb0..d5c51d73b 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -1290,7 +1290,9 @@ class KollaWorker(object): # were not matched in the first place... (not worth the # effort to run them, if they won't be used anyway). continue - if image.parent is None: + # Build all root nodes, where a root is defined as having no parent + # or having a parent that is explicitly being skipped. + if image.parent is None or image.parent.status == STATUS_SKIPPED: queue.put(BuildTask(self.conf, image, push_queue)) LOG.info('Added image %s to queue', image.name) |