From d1b79539c4b3526fde6361f774a948cee7c8da59 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 26 Jul 2013 10:31:46 -0700
Subject: [PATCH] Ensure latest setuptools after installing pip.

New versions of setuptools and old versions explode when mixed together
in dangerous ratios. Ensure the ratio is just right in the pip module
so that it ends up everywhere that needs it.

Change-Id: I22fe26c6cb40ee24ca242226e5b52dc127b4c564
---
 modules/pip/manifests/init.pp    | 6 ++++++
 modules/pip/manifests/python3.pp | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/modules/pip/manifests/init.pp b/modules/pip/manifests/init.pp
index 45a2170548..7e66cda94f 100644
--- a/modules/pip/manifests/init.pp
+++ b/modules/pip/manifests/init.pp
@@ -12,6 +12,12 @@ class pip {
     require => Package[$::pip::params::python_devel_package]
   }
 
+  package { 'setuptools':
+    ensure   => latest,
+    provider => pip,
+    require  => Package[$::pip::params::python_pip_package],
+  }
+
   if ($::operatingsystem in ['CentOS', 'RedHat']) {
 
     file { '/usr/bin/pip':
diff --git a/modules/pip/manifests/python3.pp b/modules/pip/manifests/python3.pp
index 38a24122b7..5ab9b9e6d0 100644
--- a/modules/pip/manifests/python3.pp
+++ b/modules/pip/manifests/python3.pp
@@ -12,4 +12,10 @@ class pip::python3 {
     require => Package[$::pip::params::python3_devel_package]
   }
 
+  package { 'setuptools':
+    ensure   => latest,
+    provider => pip3,
+    require  => Package[$::pip::params::python3_pip_package],
+  }
+
 }