Merge "Add new option to enable unbuildable images"
This commit is contained in:
commit
d1564384e3
|
@ -258,7 +258,9 @@ _CLI_OPTS = [
|
||||||
cfg.BoolOpt('docker-healthchecks', default=True,
|
cfg.BoolOpt('docker-healthchecks', default=True,
|
||||||
help='Add Kolla docker healthcheck scripts in the image'),
|
help='Add Kolla docker healthcheck scripts in the image'),
|
||||||
cfg.BoolOpt('quiet', short='q', default=False,
|
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 = [
|
_BASE_OPTS = [
|
||||||
|
|
|
@ -1061,9 +1061,11 @@ class KollaWorker(object):
|
||||||
self.base_arch)
|
self.base_arch)
|
||||||
tag_re = re.compile(r'^%s(\+%s)*$' % (tag_element, tag_element))
|
tag_re = re.compile(r'^%s(\+%s)*$' % (tag_element, tag_element))
|
||||||
unbuildable_images = set()
|
unbuildable_images = set()
|
||||||
for set_tag in UNBUILDABLE_IMAGES:
|
|
||||||
if tag_re.match(set_tag):
|
if not self.conf.enable_unbuildable:
|
||||||
unbuildable_images.update(UNBUILDABLE_IMAGES[set_tag])
|
for set_tag in UNBUILDABLE_IMAGES:
|
||||||
|
if tag_re.match(set_tag):
|
||||||
|
unbuildable_images.update(UNBUILDABLE_IMAGES[set_tag])
|
||||||
|
|
||||||
if unbuildable_images:
|
if unbuildable_images:
|
||||||
for image in self.images:
|
for image in self.images:
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Adds `--enable-unbuildable` options to ignore internal list of unbuildable
|
||||||
|
images. It is useful in two situations: building for new
|
||||||
|
distribution/architecture or generation of templates (with
|
||||||
|
'--templates-only' option) when all templates are needed no matter being
|
||||||
|
buildable or not.
|
||||||
|
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The way of generating templates (with '--templates-only' option) is changed.
|
||||||
|
By default only buildable ones are generated. If all templates are needed
|
||||||
|
then '--enable-unbuildable' option must be used.
|
Loading…
Reference in New Issue