Merge "kolla_builder: don't build template mapping when not needed"

This commit is contained in:
Zuul 2019-02-21 22:48:57 +00:00 committed by Gerrit Code Review
commit c7419bac12
1 changed files with 2 additions and 0 deletions

View File

@ -387,6 +387,8 @@ class KollaImageBuilder(base.BaseImageManager):
hyphenated appropriately.
'''
mapping = dict(kwargs)
if CONTAINER_IMAGES_DEFAULTS is None:
return
for k, v in CONTAINER_IMAGES_DEFAULTS.items():
mapping.setdefault(k, v)
np = mapping['name_prefix']