diff options
| author | Zuul <zuul@review.opendev.org> | 2022-02-08 11:18:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-02-08 11:18:33 +0000 |
| commit | 758b53016ac0328a584c843ef1972fa2e8572571 (patch) | |
| tree | 0f5ee56fb4eca4bb16b3191d19d1b32a2235b331 /docker | |
| parent | dd9ebe1f5c8abd62a33b54d66867240e0bcbcefd (diff) | |
| parent | e1637099d506bb746afd7f05ddef5eed2b7da314 (diff) | |
| download | kolla-758b53016ac0328a584c843ef1972fa2e8572571.tar.gz kolla-758b53016ac0328a584c843ef1972fa2e8572571.zip | |
Merge "Revert "nova: drop pypowervm dependency""
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 3 |
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/ \ |