openstack
/
kolla
Code Issues Proposed changes

kolla-toolbox: use u-c while installing virtualenv 

We need to be sure that we use exact same version every time. So fetch
upper-constraints.txt file earlier and use it while installing
virtualenv package.

Change-Id: I61711a878b2bda9f0d2e88966f13121dfcddfda7
(cherry picked from commit 13f9303b96)
This commit is contained in:
Marcin Juszkiewicz 2020-06-19 17:12:43 +02:00 committed by Radosław Piliszek
parent 381637bbac
commit 0a6cd606c6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/kolla-toolbox/Dockerfile.j2
View File

@ -78,7 +78,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'virtualenv' 'virtualenv'
] %} ] %}
RUN {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages | customizable("pip_virtualenv_packages"), constraints=false) }} \ RUN mkdir -p /requirements \
&& curl -sSL -o /requirements/upper-constraints.txt https://releases.openstack.org/constraints/upper/{{ openstack_release }} \
&& {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages | customizable("pip_virtualenv_packages")) }} \
&& virtualenv --system-site-packages {{ virtualenv_path }} && virtualenv --system-site-packages {{ virtualenv_path }}
ENV PATH {{ virtualenv_path }}/bin:$PATH ENV PATH {{ virtualenv_path }}/bin:$PATH
@ -97,9 +99,7 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH
'shade' 'shade'
] %} ] %}
RUN mkdir -p /requirements \ RUN {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \
&& curl -sSL -o /requirements/upper-constraints.txt https://releases.openstack.org/constraints/upper/{{ openstack_release }} \
&& {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/ansible /usr/share/ansible \ && mkdir -p /etc/ansible /usr/share/ansible \
&& echo 'localhost ansible_connection=local ansible_python_interpreter={{ virtualenv_path }}/bin/python' > /etc/ansible/hosts \ && echo 'localhost ansible_connection=local ansible_python_interpreter={{ virtualenv_path }}/bin/python' > /etc/ansible/hosts \
&& sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' {{ os_client_config }} && sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' {{ os_client_config }}