openstack
/
kolla
Code Issues Proposed changes

Merge "Ignore undefined values in customizable filter" into stable/rocky

This commit is contained in:
Zuul 2019-01-03 11:40:05 +00:00 committed by Gerrit Code Review
parent ffdc026761 ce161f70ae
commit 0f5ced8abe
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kolla/template/filters.py
View File

@ -13,10 +13,17 @@
# limitations under the License.
from jinja2 import contextfilter
from jinja2 import Undefined
@contextfilter
def customizable(context, val_list, call_type):
# NOTE(mgoddard): Don't try to customise undefined values. There are cases
# where this might happen, for example using a generic template overrides
# file for building multiple image install types and/or distros, where
# variables are not defined in every case.
if isinstance(val_list, Undefined):
return val_list
name = context['image_name'].replace("-", "_") + "_" + call_type + "_"
if name + "override" in context:
return context[name + "override"]