From d53ead9421a288137fba8e20b22844d1cdce6506 Mon Sep 17 00:00:00 2001 From: Xing Zhang Date: Fri, 28 Feb 2020 15:11:30 +0800 Subject: [PATCH] Fix kolla_toolbox_pip_virtualenv_packages override backport: train, stein, rocky Override in filter needs to follow the rule: __ `call_type` for `kolla_toolbox_pip_virtualenv_packages` should be `pip_virtualenv_packages`, and `pip_packages` can't match with `kolla_toolbox_pip_virtualenv_packages`, this makes the value can't be overrode in template override. Change-Id: I1dbe2dfd4bce73ce2285f45f997d45b5dcc95f4c Closes-bug: #1865119 (cherry picked from commit 74d5a66e6bf744ad936d702443a8d64be86441ba) --- docker/kolla-toolbox/Dockerfile.j2 | 2 +- ...ix-kolla-toolbox-venv-customisation-dc66f7bc621908a8.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-kolla-toolbox-venv-customisation-dc66f7bc621908a8.yaml diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 72de96e6aa..479448e72f 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -54,7 +54,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'virtualenv' ] %} -RUN {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages|customizable("pip_packages"), constraints=false) }} \ +RUN {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages | customizable("pip_virtualenv_packages"), constraints=false) }} \ && virtualenv --system-site-packages {{ virtualenv_path }} ENV PATH {{ virtualenv_path }}/bin:$PATH diff --git a/releasenotes/notes/fix-kolla-toolbox-venv-customisation-dc66f7bc621908a8.yaml b/releasenotes/notes/fix-kolla-toolbox-venv-customisation-dc66f7bc621908a8.yaml new file mode 100644 index 0000000000..9195ebdefa --- /dev/null +++ b/releasenotes/notes/fix-kolla-toolbox-venv-customisation-dc66f7bc621908a8.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fix ``kolla_toolbox_pip_virtualenv_packages`` customisation. + `LP#1865119 `__