From 1ebc7e1a472b21278c8a4136b397104ca5816564 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 16 Aug 2016 16:00:13 +1000
Subject: [PATCH] Pre-install python2-requests package for Fedora

The python-requests package has been split into a python2-requests
package on Fedora (that provides python-requests).  Install this so we
don't end up with the same problem of python2-requests overriding the
pip version later.

Change-Id: I79b52c40c2521bcc36b690112639584b6076f0d1
---
 install_puppet.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install_puppet.sh b/install_puppet.sh
index 58a37cc50b..ae70683613 100755
--- a/install_puppet.sh
+++ b/install_puppet.sh
@@ -118,7 +118,7 @@ function setup_puppet_fedora {
     # package; clear it out and re-install from pip.  This way, the
     # package is installed for dependencies, and we have a pip-managed
     # requests with correctly vendored sub-packages.
-    sudo ${YUM} install -y python-requests
+    sudo ${YUM} install -y python2-requests
     sudo rm -rf /usr/lib/python2.7/site-packages/requests/*
     sudo rm -rf /usr/lib/python2.7/site-packages/requests-*.{egg,dist}-info
     sudo pip install requests