Skip to content

Commit f371e9b

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "nova: drop pypowervm dependency"
2 parents e3e9a8b + 7de91fd commit f371e9b

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

docker/nova/nova-base/Dockerfile.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,10 @@ ADD plugins-archive /
101101
'/plugins/*'
102102
] %}
103103

104+
# NOTE(hrw): nova lists powervm in requirements and it wants 'futures' on py3.6 which can not be installed.
105+
# So let drop it as we do not support POWER architecture.
104106
RUN ln -s nova-base-source/* nova \
107+
&& sed -i -e "/^pypowervm/d" nova/requirements.txt \
105108
&& {{ macros.install_pip(nova_base_pip_packages | customizable("pip_packages")) }} \
106109
&& mkdir -p /etc/nova/ \
107110
&& cp -r /nova/etc/nova/* /etc/nova/ \
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Nova images are built without ``pypowervm`` package. It is needed only for
5+
POWER architecture support (which we do not support) and breaks CentOS
6+
builds by trying to install (Python 2 only) 'futures' package.

0 commit comments

Comments
 (0)