summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRadosław Piliszek <radoslaw.piliszek@gmail.com>2021-01-24 17:04:54 +0100
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2021-02-15 14:20:11 +0000
commit8ebfc19590fe9e3824f2f022559d9ead50e31430 (patch)
treed20b64c331f3116d717394944e1f1d5db2c81ca6
parent9b0f74e5d5581a4f802b40d47936e25a54d2c7b6 (diff)
downloadkolla-8ebfc19590fe9e3824f2f022559d9ead50e31430.tar.gz
kolla-8ebfc19590fe9e3824f2f022559d9ead50e31430.zip
Fix Mistral source images to respect upper-constraints
Backport to all supported branches. Change-Id: I4a13bbe959e3324f05d5cf78a3be2415eb2ba7ec (cherry picked from commit 004d9eb5d575fcb140b4d90fb30ced0a81dd3e66)
-rw-r--r--docker/mistral/mistral-base/Dockerfile.j22
-rw-r--r--releasenotes/notes/mistral-respect-uc-77aea99b5c6506ba.yaml4
2 files changed, 5 insertions, 1 deletions
diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2
index 8bfbb25c8..cffa92754 100644
--- a/docker/mistral/mistral-base/Dockerfile.j2
+++ b/docker/mistral/mistral-base/Dockerfile.j2
@@ -39,7 +39,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 \
diff --git a/releasenotes/notes/mistral-respect-uc-77aea99b5c6506ba.yaml b/releasenotes/notes/mistral-respect-uc-77aea99b5c6506ba.yaml
new file mode 100644
index 000000000..5fe31d462
--- /dev/null
+++ b/releasenotes/notes/mistral-respect-uc-77aea99b5c6506ba.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+ - |
+ Fixes Mistral source images to respect upper-constraints.