From aeb3d1b5877872140751d40db5b26f490ddc42c9 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 10 Jul 2013 14:34:39 -0400
Subject: [PATCH] Ensure latest setuptools is present.

Upgrading to the latest setuptools in isolation works fine, but
if the upgrade is caused by a dependency and the distribute/setuptools
upgrade happens in a bad sequence, one can wind up with a broken
setuptools environment.

Change-Id: I3d55232ac9377156e405e16dac2f07cfcaa70ff5
---
 modules/openstack_project/manifests/base.pp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/openstack_project/manifests/base.pp b/modules/openstack_project/manifests/base.pp
index 3ebf00ea21..a826ab3483 100644
--- a/modules/openstack_project/manifests/base.pp
+++ b/modules/openstack_project/manifests/base.pp
@@ -52,6 +52,11 @@ class openstack_project::base(
   }
 
   include pip
+  package { 'setuptools':
+    ensure   => latest,
+    provider => pip,
+    require  => Class['pip'],
+  }
   package { 'virtualenv':
     ensure   => latest,
     provider => pip,