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 11:31:15 +0000 |
| commit | 74d5a66e6bf744ad936d702443a8d64be86441ba (patch) | |
| tree | 428c75b11bb467481e69cdd07c42c9e03fbe36e7 | |
| parent | 1e4cf4517165b4e6bca1a84e837dccbd10a33686 (diff) | |
| download | kolla-74d5a66e6bf744ad936d702443a8d64be86441ba.tar.gz kolla-74d5a66e6bf744ad936d702443a8d64be86441ba.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
| -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 6486e882d..db42d8786 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -72,7 +72,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>`__ |