diff options
| author | Zuul <zuul@review.openstack.org> | 2018-12-27 09:11:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-12-27 09:11:24 +0000 |
| commit | f01b950eba7e101aacf1e00f57a49f237f9b1fde (patch) | |
| tree | b645af279d3f73e16807db243fc3365bffa44e6b | |
| parent | 997a609e377ab54346bddc73975a6fb6cdafc412 (diff) | |
| parent | f8d86969d0c042fd29d29df41ddd4052f687af55 (diff) | |
| download | kolla-f01b950eba7e101aacf1e00f57a49f237f9b1fde.tar.gz kolla-f01b950eba7e101aacf1e00f57a49f237f9b1fde.zip | |
Merge "Ignore undefined values in customizable filter"
| -rw-r--r-- | kolla/template/filters.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kolla/template/filters.py b/kolla/template/filters.py index 1322ef4d1..49708ee3f 100644 --- a/kolla/template/filters.py +++ b/kolla/template/filters.py @@ -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"] |