diff options
| author | Xing Zhang <angeiv.zhang@gmail.com> | 2020-02-28 15:11:30 +0800 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-02-28 17:23:44 +0000 |
| commit | 92ef9274e3a651e6fc2d6d2f0b2a8b00672a246a (patch) | |
| tree | adccf05be59d57a904a1fb02e450162a3e3ecc20 | |
| parent | f25c272c707dc17c1ad8ac9345ed295218f7cd34 (diff) | |
| download | kolla-92ef9274e3a651e6fc2d6d2f0b2a8b00672a246a.tar.gz kolla-92ef9274e3a651e6fc2d6d2f0b2a8b00672a246a.zip | |
Fix kolla_toolbox_pip_virtualenv_packages override
backport: train, stein, rocky
Override in filter needs to follow the rule:
<image_name>_<call_type>_<override/append/remove>
`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)
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | releasenotes/notes/fix-kolla-toolbox-venv-customisation-dc66f7bc621908a8.yaml | 5 |
2 files changed, 6 insertions, 1 deletions
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 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 000000000..9195ebdef --- /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 <https://launchpad.net/bugs/1865119>`__ |