From 55dba783c00608c84db6b111c0bf56261787dee2 Mon Sep 17 00:00:00 2001
From: Erik Rose <erik@mozilla.com>
Date: Fri, 22 Jan 2016 15:18:33 -0500
Subject: [PATCH] Port bootstrapper fixes to the new le-auto's bootstrappers.

---
 letsencrypt-auto-source/letsencrypt-auto                 | 9 +++++++--
 .../pieces/bootstrappers/rpm_common.sh                   | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/letsencrypt-auto-source/letsencrypt-auto b/letsencrypt-auto-source/letsencrypt-auto
index 3cdd49549..9eebddc9d 100755
--- a/letsencrypt-auto-source/letsencrypt-auto
+++ b/letsencrypt-auto-source/letsencrypt-auto
@@ -213,6 +213,7 @@ BootstrapRpmCommon() {
   # Tested with:
   #   - Fedora 22, 23 (x64)
   #   - Centos 7 (x64: on DigitalOcean droplet)
+  #   - CentOS 7 Minimal install in a Hyper-V VM
 
   if type dnf 2>/dev/null
   then
@@ -231,12 +232,16 @@ BootstrapRpmCommon() {
   if ! $SUDO $tool install -y \
          python \
          python-devel \
-         python-virtualenv
+         python-virtualenv \
+         python-tools \
+         python-pip
   then
     if ! $SUDO $tool install -y \
            python27 \
            python27-devel \
-           python27-virtualenv
+           python27-virtualenv \
+           python27-tools \
+           python27-pip
     then
       echo "Could not install Python dependencies. Aborting bootstrap!"
       exit 1
diff --git a/letsencrypt-auto-source/pieces/bootstrappers/rpm_common.sh b/letsencrypt-auto-source/pieces/bootstrappers/rpm_common.sh
index 8a8f1526a..68a11a531 100755
--- a/letsencrypt-auto-source/pieces/bootstrappers/rpm_common.sh
+++ b/letsencrypt-auto-source/pieces/bootstrappers/rpm_common.sh
@@ -2,6 +2,7 @@ BootstrapRpmCommon() {
   # Tested with:
   #   - Fedora 22, 23 (x64)
   #   - Centos 7 (x64: on DigitalOcean droplet)
+  #   - CentOS 7 Minimal install in a Hyper-V VM
 
   if type dnf 2>/dev/null
   then
@@ -20,12 +21,16 @@ BootstrapRpmCommon() {
   if ! $SUDO $tool install -y \
          python \
          python-devel \
-         python-virtualenv
+         python-virtualenv \
+         python-tools \
+         python-pip
   then
     if ! $SUDO $tool install -y \
            python27 \
            python27-devel \
-           python27-virtualenv
+           python27-virtualenv \
+           python27-tools \
+           python27-pip
     then
       echo "Could not install Python dependencies. Aborting bootstrap!"
       exit 1