diff options
| author | Zuul <zuul@review.opendev.org> | 2021-05-07 21:48:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-05-07 21:48:25 +0000 |
| commit | bb1b8c37d4336c136fbe33d262006771debfa100 (patch) | |
| tree | b536fc69187ff77282e2236e66dcb26eebf63b4e | |
| parent | c9b0e2ae402345a606a90878a643ee5560615c1a (diff) | |
| parent | 44138213470992a15c473c08c10bbaccb2627d9e (diff) | |
| download | kolla-bb1b8c37d4336c136fbe33d262006771debfa100.tar.gz kolla-bb1b8c37d4336c136fbe33d262006771debfa100.zip | |
Merge "Fix Mistral source images to respect upper-constraints" into stable/train
| -rw-r--r-- | docker/mistral/mistral-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | releasenotes/notes/mistral-respect-uc-77aea99b5c6506ba.yaml | 4 |
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. |