From baa4cd731e1d1a9ae37fe3ca5ebfd86ada28bfb3 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 12 Feb 2020 16:47:57 -0600 Subject: [PATCH] Just use the pip from the virtualenv There is only one python, so there is only one pip. Change-Id: I31bc5a7bad603f3f58a3d2ac1501271935830cdd --- devstack-vm-gate-wrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 46d6094c..d37c0f80 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -505,8 +505,8 @@ virtualenv -p python${PYTHON_VER} /tmp/ansible # Explicitly install pbr first as this will use pip rathat than # easy_install. Hope is this is generally more reliable. -/tmp/ansible/bin/${PIP} install pbr -/tmp/ansible/bin/${PIP} install ansible==$ANSIBLE_VERSION \ +/tmp/ansible/bin/pip install pbr +/tmp/ansible/bin/pip install ansible==$ANSIBLE_VERSION \ devstack-tools==$DSTOOLS_VERSION 'ara<1.0.0' 'cmd2<0.9.0' export ANSIBLE=/tmp/ansible/bin/ansible export ANSIBLE_PLAYBOOK=/tmp/ansible/bin/ansible-playbook