From 04ca3ca8611eadcc5f93eaca0325eee4aa33289a Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 11 Apr 2017 18:26:51 -0400 Subject: [PATCH] Revert "Revert "Stop installing pip from install_puppet.sh"" Now that we have fixed our python2 / python3 virtualenv issues, we can try moving forward with this patch. This reverts commit 503ed9407587792ca27254f1702e095b18447293. Change-Id: I4121617663ca3495ec9dfac9b7ca1b5afbce57ce Depends-On: I18412767f0ebf946d557a0a126285369e96af159 Signed-off-by: Paul Belanger --- nodepool/elements/puppet/install.d/05-puppet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodepool/elements/puppet/install.d/05-puppet b/nodepool/elements/puppet/install.d/05-puppet index 29bd47c0ca..1903d0845c 100755 --- a/nodepool/elements/puppet/install.d/05-puppet +++ b/nodepool/elements/puppet/install.d/05-puppet @@ -24,7 +24,7 @@ set -e # Unset the download cache for this invocation to prevent bleed from build host unset PIP_DOWNLOAD_CACHE -/bin/bash /opt/build_git/openstack-infra/system-config/install_puppet.sh +SETUP_PIP=false /bin/bash /opt/build_git/openstack-infra/system-config/install_puppet.sh /bin/bash /opt/build_git/openstack-infra/system-config/install_modules.sh install -m 0755 -o root -g root $(dirname $0)/../bin/prepare-node /usr/local/bin