Skip to content

Commit d53ead9

Browse files
angeivyoctozepto
authored andcommitted
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 74d5a66)
1 parent 7195b70 commit d53ead9

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

docker/kolla-toolbox/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
5454
'virtualenv'
5555
] %}
5656

57-
RUN {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages|customizable("pip_packages"), constraints=false) }} \
57+
RUN {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages | customizable("pip_virtualenv_packages"), constraints=false) }} \
5858
&& virtualenv --system-site-packages {{ virtualenv_path }}
5959

6060
ENV PATH {{ virtualenv_path }}/bin:$PATH
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Fix ``kolla_toolbox_pip_virtualenv_packages`` customisation.
5+
`LP#1865119 <https://launchpad.net/bugs/1865119>`__

0 commit comments

Comments
 (0)