From 49398f39d39c1026fe0be2288574c0f71b1cd295 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 10 Jul 2012 12:28:11 -0500
Subject: [PATCH] Install tox and latest pip on all slaves.

Change-Id: I5ac40d18f7b6ec0243f68d3740fe4895da64471c
---
 manifests/site.pp                       | 11 -----------
 modules/jenkins_slave/manifests/init.pp | 14 +++++++-------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 68bb5172c5..f0fbb70865 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -545,12 +545,6 @@ node 'precise8.slave.openstack.org' {
   include openstack_cron
   include openstack_jenkins_slave
 
-  package { "tox":
-    ensure => latest,  # okay to use latest for pip
-    provider => pip,
-    require => Package[python-pip],
-  }
-
   include ulimit
   ulimit::conf { 'limit_jenkins_procs':
     limit_domain => 'jenkins',
@@ -565,11 +559,6 @@ node /^.*\.slave\.openstack\.org$/ {
   include openstack_cron
   include openstack_jenkins_slave
 
-  package { "tox":
-    ensure => latest,  # okay to use latest for pip
-    provider => pip,
-    require => Package[python-pip],
-  }
 }
 
 # bare-bones slaves spun up by jclouds. Specifically need to not set ssh
diff --git a/modules/jenkins_slave/manifests/init.pp b/modules/jenkins_slave/manifests/init.pp
index 1717869a4e..2fc1f4de32 100644
--- a/modules/jenkins_slave/manifests/init.pp
+++ b/modules/jenkins_slave/manifests/init.pp
@@ -80,14 +80,14 @@ class jenkins_slave($ssh_key, $sudo = false, $bare = false, $user = true) {
       ensure => present,
     }
 
-    package { "setuptools-git":
-      ensure => latest,  # okay to use latest for pip
-      provider => pip,
-      require => Package[python-pip],
-    }
+    # Packages that need to be installed from pip
+    $pip_packages = [
+                 "git-review",
+                 "setuptools-git",
+                 "tox"]
 
-    package { "git-review":
-      ensure => latest,  # okay to use latest for pip
+    package { $pip_packages:
+      ensure => latest,  # we want the latest from these
       provider => pip,
       require => Package[python-pip],
     }