From 92ef9274e3a651e6fc2d6d2f0b2a8b00672a246a Mon Sep 17 00:00:00 2001 From: Xing Zhang Date: Fri, 28 Feb 2020 15:11:30 +0800 Subject: 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index f0a75f1ec..fbe4abc7c 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -78,7 +78,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 -- cgit v1.2.3