diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-01-10 06:16:51 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-01-10 07:38:17 +0000 |
| commit | 27b6bb11dc867ef62c5d3a03ec7f4e8b86cccf50 (patch) | |
| tree | ce900243879473c7c0a41a4c5f40f2ad183b8291 /docker | |
| parent | efcec7bc429b82dd47cc16e32b10650740a4710b (diff) | |
| download | kolla-27b6bb11dc867ef62c5d3a03ec7f4e8b86cccf50.tar.gz kolla-27b6bb11dc867ef62c5d3a03ec7f4e8b86cccf50.zip | |
neutron: fix build in stable branches
When [1] was committed, neutron stopped building for Train.
Analogous patch is proposed to other stable branches.
This patch removes neutron from upper-constraints.
Kolla master is affected directly because we build Train
for CentOS 7 atm.
1. https://review.opendev.org/#/c/697370/
Change-Id: I944e8e42fef1d359d767cbc6e1c13371ed753f31
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 68f8316d1..4594c30ca 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -129,6 +129,7 @@ ADD plugins-archive / ] %} RUN ln -s neutron-base-source/* neutron \ + && sed -i /^neutron=/d /requirements/upper-constraints.txt \ && {{ macros.install_pip(neutron_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/neutron /usr/share/neutron \ && cp -r /neutron/etc/* /etc/neutron/ \ |