diff options
| author | Zuul <zuul@review.opendev.org> | 2021-01-26 11:55:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-01-26 11:55:00 +0000 |
| commit | f6c4fc69d93754843709f045d0bf9ebf6c416cba (patch) | |
| tree | 75e29acd476246fe6e5a033658b2cfcc088e1721 /docker/openstack-base | |
| parent | 50265b3c7d2868ad57bb007951fd04d2ec09f16a (diff) | |
| parent | 278893ef1d9bc8f7d013685d0676ce2458fcaaaa (diff) | |
| download | kolla-f6c4fc69d93754843709f045d0bf9ebf6c416cba.tar.gz kolla-f6c4fc69d93754843709f045d0bf9ebf6c416cba.zip | |
Merge "Improve pip install process for offline deployment." into stable/train
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 30427bbe1..9ff44b86f 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -276,10 +276,6 @@ ENV DEBIAN_FRONTEND noninteractive {{ macros.install_packages(openstack_base_packages | customizable("packages")) }} -{% block source_install_python_pip %} -{{ macros.get_pip() }} -{% endblock %} - {% set openstack_base_pip_packages = [ 'Babel', 'Mako', @@ -409,7 +405,7 @@ ENV DEBIAN_FRONTEND noninteractive ADD openstack-base-archive /openstack-base-source RUN ln -s openstack-base-source/* /requirements \ && mkdir -p /var/lib/kolla \ - && {{ macros.install_pip(['virtualenv'], constraints = false)}} \ + && {{ macros.install_pip(['virtualenv'])}} \ && virtualenv --system-site-packages /var/lib/kolla/venv ENV PATH /var/lib/kolla/venv/bin:$PATH |