From 7698f7d2fe98fc4e7372821313f2dca2ac55ac43 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 9 Sep 2011 11:13:28 -0700
Subject: [PATCH] Install nosexcover from packages instead of PIP.

Change-Id: I1c7b9d7c525f7f96cc11e4d7062de0593c49e0cf
---
 manifests/site.pp                       | 15 ++++----------
 modules/jenkins_slave/manifests/init.pp | 27 +++++++++++++++++++++----
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 53200def19..e0439362d8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -45,6 +45,10 @@ class openstack_jenkins_slave {
   include openstack_base
   include openstack_ci_admins_users
   include jenkins_slave
+
+  apt::ppa { "ppa:nova-core/trunk":
+    ensure => present
+  }
 }
 
 #
@@ -328,9 +332,6 @@ node /^keystone(-\d+)?\.slave\.openstack\.org$/ {
   apt::ppa { "ppa:keystone-core/trunk":
     ensure => present
   }
-  apt::ppa { "ppa:nova-core/trunk":
-    ensure => present
-  }
   apt::ppa { "ppa:swift-core/trunk":
     ensure => present
   }
@@ -359,10 +360,6 @@ node /^keystone(-\d+)?\.slave\.openstack\.org$/ {
 node /^quantum(-\d+)?\.slave\.openstack\.org$/ {
   include openstack_jenkins_slave
 
-  apt::ppa { "ppa:nova-core/trunk":
-    ensure => present
-  }
-
   $slave_packages = ["python-eventlet",
                      "python-paste",
                      "python-routes",
@@ -389,10 +386,6 @@ node /^manuals(-\d+)?\.slave\.openstack\.org$/ {
 node /^nova(-\d+)?\.slave\.openstack\.org$/ {
   include openstack_jenkins_slave
 
-  apt::ppa { "ppa:nova-core/trunk":
-    ensure => present
-  }
-
   apt::builddep { "nova":
     ensure => present,
     require => Apt::Ppa["ppa:nova-core/trunk"]
diff --git a/modules/jenkins_slave/manifests/init.pp b/modules/jenkins_slave/manifests/init.pp
index a01dd3b8e3..d70fc4c439 100644
--- a/modules/jenkins_slave/manifests/init.pp
+++ b/modules/jenkins_slave/manifests/init.pp
@@ -85,18 +85,37 @@ class jenkins_slave {
 
     package { "python-coverage":
         ensure => latest,
-        require => Package[python-nose]
+        require => [Apt::Ppa["ppa:nova-core/trunk"],
+                    Package[python-nose]]
           }
 
     package { "python-nose":
         ensure => latest,
-        require => Package[python-pip]
+        require => Apt::Ppa["ppa:nova-core/trunk"],
+          }
+
+    package { "python-nosexcover":
+        ensure => latest,
+        require => [Apt::Ppa["ppa:nova-core/trunk"],
+                    Package[python-coverage]]
+          }
+
+    package { "coverage":
+        ensure => absent,
+        provider => pip,
+        require => Package[python-pip],
+          }
+
+    package { "nose":
+        ensure => absent,
+        provider => pip,
+        require => Package[python-pip],
           }
 
     package { "nosexcover":
-        ensure => latest,
+        ensure => absent,
         provider => pip,
-        require => Package[python-coverage]
+        require => Package[python-pip],
     }
 
 }