summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2021-12-01 16:48:51 +0100
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2021-12-01 16:52:08 +0100
commit7de91fd60355104cbd650e0fe6f680b2eb0f2ffa (patch)
tree1b38762645be65899adceff9cff84eadd96f4572
parent1a9d5a1a42c86b447af371ab5e0864f2b452f6ad (diff)
downloadkolla-7de91fd60355104cbd650e0fe6f680b2eb0f2ffa.tar.gz
kolla-7de91fd60355104cbd650e0fe6f680b2eb0f2ffa.zip
nova: drop pypowervm dependency
Nova depends on pypowervm for POWER architecture support. But it is unmaintained upstream and breaks CentOS builds (wants to install Py2 only 'futures' package). Change-Id: Ife9385c93239e910db2e4405ec4661f667357bc0
-rw-r--r--docker/nova/nova-base/Dockerfile.j23
-rw-r--r--releasenotes/notes/nova-drop-pypowervm-256048c2a9cd594d.yaml6
2 files changed, 9 insertions, 0 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index 1771181a3..4f168ab08 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-base/Dockerfile.j2
@@ -101,7 +101,10 @@ 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/ \
diff --git a/releasenotes/notes/nova-drop-pypowervm-256048c2a9cd594d.yaml b/releasenotes/notes/nova-drop-pypowervm-256048c2a9cd594d.yaml
new file mode 100644
index 000000000..cf6c64aac
--- /dev/null
+++ b/releasenotes/notes/nova-drop-pypowervm-256048c2a9cd594d.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+ - |
+ Nova images are built without ``pypowervm`` package. It is needed only for
+ POWER architecture support (which we do not support) and breaks CentOS
+ builds by trying to install (Python 2 only) 'futures' package.