openstack
/
kolla
Code Issues Proposed changes

Merge "Fix Mistral source images to respect upper-constraints" into stable/victoria

This commit is contained in:
Zuul 2021-02-08 12:29:22 +00:00 committed by Gerrit Code Review
parent 4e3b178e6e cf305aaaf0
commit 08af0bcae3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/mistral/mistral-base/Dockerfile.j2
View File

@ -41,7 +41,7 @@ ADD plugins-archive /
] %}
RUN ln -s mistral-base-source/* mistral \
&& {{ macros.install_pip(mistral_base_pip_packages | customizable("pip_packages"), constraints = false) }} \
&& {{ macros.install_pip(mistral_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/mistral \
&& cp -r /mistral/etc/* /etc/mistral/ \
&& chown -R mistral: /etc/mistral \

4
releasenotes/notes/mistral-respect-uc-77aea99b5c6506ba.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- |
Fixes Mistral source images to respect upper-constraints.