Merge "Add new option to enable unbuildable images"

2 files changed, 8 insertions, 4 deletions

diff --git a/kolla/common/config.py b/kolla/common/config.py
index 9c95de302..ce6be6e15 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -258,7 +258,9 @@ _CLI_OPTS = [
     cfg.BoolOpt('docker-healthchecks', default=True,
                 help='Add Kolla docker healthcheck scripts in the image'),
     cfg.BoolOpt('quiet', short='q', default=False,
-                help='Do not print image logs')
+                help='Do not print image logs'),
+    cfg.BoolOpt('enable-unbuildable', default=False,
+                help='Enable images marked as unbuildable')
 ]
 
 _BASE_OPTS = [
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: