From 905b3a8859d20f79da617ac99bbb515470ae98c7 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 23 Oct 2012 09:58:48 -0700 Subject: [PATCH] Fix python-jenkins duplicate package. Change-Id: I9cf1679c230750c1cd14a0d73bc78652096fe391 Reviewed-on: https://review.openstack.org/14687 Reviewed-by: Clark Boylan Approved: James E. Blair Tested-by: Jenkins --- modules/jenkins/manifests/job_builder.pp | 8 ++++---- modules/jenkins/manifests/master.pp | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/modules/jenkins/manifests/job_builder.pp b/modules/jenkins/manifests/job_builder.pp index 8721db9520..8f5be16356 100644 --- a/modules/jenkins/manifests/job_builder.pp +++ b/modules/jenkins/manifests/job_builder.pp @@ -12,10 +12,10 @@ class jenkins::job_builder ( } } - package { "python-jenkins": - ensure => latest, # okay to use latest for pip - provider => pip, - require => Class[pip] + if ! defined(Package['python-jenkins']) { + package { "python-jenkins": + ensure => present, + } } vcsrepo { "/opt/jenkins_job_builder": diff --git a/modules/jenkins/manifests/master.pp b/modules/jenkins/manifests/master.pp index d335073473..18736241e6 100644 --- a/modules/jenkins/manifests/master.pp +++ b/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'],