aboutsummaryrefslogtreecommitdiff
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-01-24 17:06:25 +0100
commit004d9eb5d575fcb140b4d90fb30ced0a81dd3e66 (patch)
tree9933a60e75919287e923db78aa38a7f5e12674d2
parent6fbae18f075a7f92923766be5b980acc892a0e00 (diff)
downloadkolla-004d9eb5d575fcb140b4d90fb30ced0a81dd3e66.tar.gz
kolla-004d9eb5d575fcb140b4d90fb30ced0a81dd3e66.zip
Fix Mistral source images to respect upper-constraints
Backport to all supported branches. Change-Id: I4a13bbe959e3324f05d5cf78a3be2415eb2ba7ec
-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 22bcd647c..d2f608f59 100644
--- a/docker/mistral/mistral-base/Dockerfile.j2
+++ b/docker/mistral/mistral-base/Dockerfile.j2
@@ -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 \
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.