Fix python-jenkins duplicate package.

Change-Id: I9cf1679c230750c1cd14a0d73bc78652096fe391
Reviewed-on: https://review.openstack.org/14687
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins

modules/jenkins/manifests/job_builder.pp

@@ -12,10 +12,10 @@ class jenkins::job_builder (
     }
   }
 
-  package { "python-jenkins":
+  if ! defined(Package['python-jenkins']) {
-    ensure => latest,  # okay to use latest for pip
+    package { "python-jenkins":
-    provider => pip,
+      ensure => present,
-    require => Class[pip]
+    }
   }
 
   vcsrepo { "/opt/jenkins_job_builder":

modules/jenkins/manifests/master.pp

@@ -78,7 +78,6 @@ class jenkins::master(
 
   $packages = [
     'python-babel',
-    'python-jenkins',     # devstack-gate
     'python-sqlalchemy',  # devstack-gate
     'ssl-cert',
   ]
@@ -87,6 +86,13 @@ class jenkins::master(
     ensure => "present",
   }
 
+  # devstack-gate
+  if ! defined(Package['python-jenkins']) {
+    package { "python-jenkins":
+      ensure => present,
+    }
+  }
+
   package { "jenkins":
     ensure => "present",
     require => Apt::Source['jenkins'],