openstack/kolla
Code Issues Proposed changes

Fix kolla_toolbox_pip_virtualenv_packages override

Browse Source 
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
This commit is contained in:
Xing Zhang 2020-02-28 15:11:30 +08:00 committed by Radosław Piliszek
parent 1e4cf45171
commit 74d5a66e6b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/kolla-toolbox/Dockerfile.j2
View File

@ -72,7 +72,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'virtualenv' '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 }} && virtualenv --system-site-packages {{ virtualenv_path }}
ENV PATH {{ virtualenv_path }}/bin:$PATH ENV PATH {{ virtualenv_path }}/bin:$PATH

5
releasenotes/notes/fix-kolla-toolbox-venv-customisation-dc66f7bc621908a8.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fix ``kolla_toolbox_pip_virtualenv_packages`` customisation.
`LP#1865119 <https://launchpad.net/bugs/1865119>`__