diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-01-07 11:15:07 +0100 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-01-08 07:43:04 +0000 |
| commit | 0067266673ed37facaf5656cce0dd5a0bcea0214 (patch) | |
| tree | 51dfc4be1e4fcd063d0b07be62dad786a100aa06 /docker | |
| parent | 16422e1ef44239a581bbdd89ac8da7bbcd2bd5d8 (diff) | |
| download | kolla-0067266673ed37facaf5656cce0dd5a0bcea0214.tar.gz kolla-0067266673ed37facaf5656cce0dd5a0bcea0214.zip | |
horizon: fix build in stable branches
When [1] was committed, horizon stopped building for Train.
Analogous patch is proposed to other stable branches.
This patch removes horizon from upper-constraints.
Kolla master is affected directly because we build Train
for CentOS 7 atm.
[1] https://opendev.org/openstack/requirements/commit/3e54878f9c87266e1b9775f72af06de27a3dad65
Co-authored-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Change-Id: I1bd5a40eeef9612d995c81426fe510e89f438725
(cherry picked from commit 8b7ec43536842dd500cc5ee1198a318070ac1046)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 1423f05a1..5ce5e7f72 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -157,7 +157,9 @@ ADD plugins-archive / '/plugins/*' ] %} +# NOTE(hrw): to install horizon from unpacked sources we cannot have it in upper-constraints.txt RUN ln -s horizon-source/* horizon \ + && sed -i /^horizon=/d /requirements/upper-constraints.txt \ && {{ macros.install_pip(horizon_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/openstack-dashboard \ && cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \ |