diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-28 18:09:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-28 18:09:31 +0000 |
| commit | d1564384e313172937ce7d30b84752e41fd66a5e (patch) | |
| tree | ab28811b3b16028abbb4704c06aa41398d992c67 /kolla/image | |
| parent | 2fdc76124ccf47823e1a0f665ce1d278e5a131f5 (diff) | |
| parent | e22c529166f78e79760aeb0cc3b4ab33dd3b6f9c (diff) | |
| download | kolla-d1564384e313172937ce7d30b84752e41fd66a5e.tar.gz kolla-d1564384e313172937ce7d30b84752e41fd66a5e.zip | |
Merge "Add new option to enable unbuildable images"
Diffstat (limited to 'kolla/image')
| -rwxr-xr-x | kolla/image/build.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index bb9012f42..60625409e 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -1061,9 +1061,11 @@ class KollaWorker(object): self.base_arch) tag_re = re.compile(r'^%s(\+%s)*$' % (tag_element, tag_element)) unbuildable_images = set() - for set_tag in UNBUILDABLE_IMAGES: - if tag_re.match(set_tag): - unbuildable_images.update(UNBUILDABLE_IMAGES[set_tag]) + + if not self.conf.enable_unbuildable: + for set_tag in UNBUILDABLE_IMAGES: + if tag_re.match(set_tag): + unbuildable_images.update(UNBUILDABLE_IMAGES[set_tag]) if unbuildable_images: for image in self.images: |