aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-02-01 12:37:19 +0000
committerMichal Nasiadka <mnasiadka@gmail.com>2022-02-08 07:16:44 +0000
commite1637099d506bb746afd7f05ddef5eed2b7da314 (patch)
tree56202bc05a0c9f06540f289a0b85a1b91e7ca00a
parent405fca90f2c8d3763ac56ce8b925611d136bba6c (diff)
downloadkolla-e1637099d506bb746afd7f05ddef5eed2b7da314.tar.gz
kolla-e1637099d506bb746afd7f05ddef5eed2b7da314.zip
Revert "nova: drop pypowervm dependency"
This reverts commit 7de91fd60355104cbd650e0fe6f680b2eb0f2ffa. Reason for revert: Nova dropped pypowervm dependency so we do not need to handle it anymore. Change-Id: I8bb6c4c07c30f108e77fbb8cdc38d634b42b900f
-rw-r--r--docker/nova/nova-base/Dockerfile.j23
1 files changed, 0 insertions, 3 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index 4f168ab08..1771181a3 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-base/Dockerfile.j2
@@ -101,10 +101,7 @@ ADD plugins-archive /
'/plugins/*'
] %}
-# NOTE(hrw): nova lists powervm in requirements and it wants 'futures' on py3.6 which can not be installed.
-# So let drop it as we do not support POWER architecture.
RUN ln -s nova-base-source/* nova \
- && sed -i -e "/^pypowervm/d" nova/requirements.txt \
&& {{ macros.install_pip(nova_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/nova/ \
&& cp -r /nova/etc/nova/* /etc/nova/ \