openstack
/
devstack-gate
Code Issues Proposed changes

Merge "Just use the pip from the virtualenv"

This commit is contained in:
Zuul 2020-02-13 13:53:15 +00:00 committed by Gerrit Code Review
parent ecf9df2e93 baa4cd731e
commit 4d64b8529d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack-vm-gate-wrap.sh
View File

@ -509,8 +509,8 @@ virtualenv -p python${PYTHON_VER} /tmp/ansible
# Explicitly install pbr first as this will use pip rathat than # Explicitly install pbr first as this will use pip rathat than
# easy_install. Hope is this is generally more reliable. # easy_install. Hope is this is generally more reliable.
/tmp/ansible/bin/${PIP} install pbr /tmp/ansible/bin/pip install pbr
/tmp/ansible/bin/${PIP} install ansible==$ANSIBLE_VERSION \ /tmp/ansible/bin/pip install ansible==$ANSIBLE_VERSION \
devstack-tools==$DSTOOLS_VERSION 'ara<1.0.0' 'cmd2<0.9.0' devstack-tools==$DSTOOLS_VERSION 'ara<1.0.0' 'cmd2<0.9.0'
export ANSIBLE=/tmp/ansible/bin/ansible export ANSIBLE=/tmp/ansible/bin/ansible
export ANSIBLE_PLAYBOOK=/tmp/ansible/bin/ansible-playbook export ANSIBLE_PLAYBOOK=/tmp/ansible/bin/ansible-playbook