diff options
| author | Zuul <zuul@review.opendev.org> | 2021-12-04 21:06:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-12-04 21:06:41 +0000 |
| commit | f371e9b6eb6b850d9cd096f7f2e3607ff207d6ae (patch) | |
| tree | 7b940fdbb3ffb62b6ae299fede5b442f05a8d264 /docker | |
| parent | e3e9a8bea5ae72226bcc5eb35c746d10b3588522 (diff) | |
| parent | 7de91fd60355104cbd650e0fe6f680b2eb0f2ffa (diff) | |
| download | kolla-f371e9b6eb6b850d9cd096f7f2e3607ff207d6ae.tar.gz kolla-f371e9b6eb6b850d9cd096f7f2e3607ff207d6ae.zip | |
Merge "nova: drop pypowervm dependency"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 3 |
1 files changed, 3 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/ \ |