f8d86969d0
When using the customizable filter to modify variables, if a template
overrides file is shared between multiple sets of images, it is sometimes
possible that a customised variable does not exist for a set of images.
A specific example:
My template overrides file has this:
{% set ironic_inspector_packages_append = ["python-pip"] %}
Normally I build binary/centos images.
kolla-build -t binary
Sometimes however I build a bifrost centos/source image, because bifrost
does not support binary images.
kolla-build -t source bifrost
The ironic inspector image does not define ironic_inspector_packages for
the source build, since it does not need any.
{% elif install_type == 'source' %}
{% if base_distro in ['debian', 'ubuntu'] %}
{% set ironic_inspector_packages = ['iptables'] %}
{% endif %}
{{ macros.install_packages(ironic_inspector_packages |
customizable("packages")) }}
The install_packages macro copes with the undefined variable, however
the customizable filter does not handle the base variable being
undefined if a customised example exists.
This change allows the customizable filter to ignore undefined
variables, even if they have been customised.
Change-Id: Ibe2fc91f5b6ceee8f937dd73c235128b2db525b1
Closes-Bug: #1809491
37 lines
1.4 KiB
Python
37 lines
1.4 KiB
Python
#!/usr/bin/env python
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# 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"]
|
|
if name + "append" in context:
|
|
val_list.extend(context[name + "append"])
|
|
if name + "remove" in context:
|
|
for removal in context[name + "remove"]:
|
|
if removal in val_list:
|
|
val_list.remove(removal)
|
|
return val_list
|