diff options
| author | Zuul <zuul@review.opendev.org> | 2022-03-01 20:45:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-03-01 20:45:41 +0000 |
| commit | 2d7112345807dc1beee7b5d6c006056e8ecf3916 (patch) | |
| tree | 5732f9d3b81e0cb1ba307718e2bd59ec241b0b96 /docker | |
| parent | 8e8a499adc3ae0c4009bacde65cf3a141632ef3c (diff) | |
| parent | 1ed3a2897445ad3ffefc2cff98218f7e207c34b9 (diff) | |
| download | kolla-2d7112345807dc1beee7b5d6c006056e8ecf3916.tar.gz kolla-2d7112345807dc1beee7b5d6c006056e8ecf3916.zip | |
Merge "Revert "neutron: fix build in stable branches""
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 6dac6425c..9d597b6fe 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -102,7 +102,6 @@ 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 \ && cp -r /neutron/etc/* /etc/neutron/ \ |