From 82936cd43efcd86f3e7ee7e18ff5c17e412b51b0 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 1 Aug 2013 16:24:42 -0700
Subject: [PATCH] Revert "Ensure latest setuptools after installing pip."
This reverts commit d1b79539c4b3526fde6361f774a948cee7c8da59.
This commit was breaking devstack-gate for stable/grizzly changes.
Change-Id: I6b138d7ed5f8ad0362801b569dd46834d41b4cf7
---
modules/pip/manifests/init.pp | 6 ------
modules/pip/manifests/python3.pp | 6 ------
2 files changed, 12 deletions(-)
diff --git a/modules/pip/manifests/init.pp b/modules/pip/manifests/init.pp
index 7e66cda94f..45a2170548 100644
--- a/modules/pip/manifests/init.pp
+++ b/modules/pip/manifests/init.pp
@@ -12,12 +12,6 @@ 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 5ab9b9e6d0..38a24122b7 100644
--- a/modules/pip/manifests/python3.pp
+++ b/modules/pip/manifests/python3.pp
@@ -12,10 +12,4 @@ class pip::python3 {
require => Package[$::pip::params::python3_devel_package]
}
- package { 'setuptools':
- ensure => latest,
- provider => pip3,
- require => Package[$::pip::params::python3_pip_package],
- }
-
}