From 186ee20ab36845b1610bb105e4536615052ded70 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Tue, 30 Oct 2012 17:46:40 +0100
Subject: [PATCH] Remove circular pip dependency in pypi mirror.

Instead, create a dependency in the script that requires pip
so that it's clear why pip is included.

Change-Id: I063e622836d6a0c62cc77d8527bef3cf93657648
Reviewed-on: https://review.openstack.org/15044
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
---
 modules/pypimirror/manifests/init.pp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/pypimirror/manifests/init.pp b/modules/pypimirror/manifests/init.pp
index e3aa6eabe1..39e2bd23b2 100644
--- a/modules/pypimirror/manifests/init.pp
+++ b/modules/pypimirror/manifests/init.pp
@@ -16,12 +16,6 @@ class pypimirror(
     ensure => 'present'
   }
 
-  package { 'pip':
-    ensure   => present,
-    provider => 'pip',
-    require  => Class[pip]
-  }
-
   file { '/usr/local/mirror_scripts':
     ensure => directory,
     mode   => '0755',
@@ -63,7 +57,8 @@ class pypimirror(
     owner   => 'root',
     group   => 'root',
     content => template('pypimirror/run-mirror.sh.erb'),
-    require => File['/usr/local/mirror_scripts'],
+    require => [File['/usr/local/mirror_scripts'],
+                Class[pip]],
   }
 
   file { '/usr/local/mirror_scripts/run_mirror.py':