From 12ced38ca77715fb5974cb4c3f3fd28650b951ed Mon Sep 17 00:00:00 2001
From: Dan Bode <bodepd@gmail.com>
Date: Wed, 31 Jul 2013 17:22:56 -0700
Subject: [PATCH] Ensure python pip is installed before zuul

Previously, installing zuul resulted in the erros:

  /usr/bin/python: No module named pip

This commit ensures that python-pip is always installed
before zuul is installed so that it can install
correctly.

Change-Id: I6d73a67e1fbb9eb077f39f99c45ceb4a00bc652b
---
 modules/zuul/manifests/init.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index 4efc5e0264..c4f2c1f6c6 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -36,6 +36,7 @@ class zuul (
   $statsd_host = ''
 ) {
   include apache
+  include pip
 
   $packages = [
     'python-webob',
@@ -93,6 +94,7 @@ class zuul (
     path        => '/bin:/usr/bin',
     refreshonly => true,
     subscribe   => Vcsrepo['/opt/zuul'],
+    require     => Class['pip'],
   }
 
   file { '/etc/zuul':