From 5c6e8de554f82bf0051f17a378ccd74c9b87c025 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sat, 12 Oct 2013 13:58:11 -0400 Subject: [PATCH] Remove explicit depends on transitive pip deps These things were listed before we had jeepyb as its own things (gerritlib in gerrit) and before jeepyb has pbr/requirements.txt as it does now. With the move to pip install -U . in /opt/jeepyb, there is no need to also ask puppet to manage these. Change-Id: I7b521d03b3df8c0bde37586748769f160e615d31 --- modules/gerrit/manifests/init.pp | 14 -------------- modules/jeepyb/manifests/init.pp | 24 ------------------------ 2 files changed, 38 deletions(-) diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp index 3ee714f461..21d7180512 100644 --- a/modules/gerrit/manifests/init.pp +++ b/modules/gerrit/manifests/init.pp @@ -163,20 +163,6 @@ class gerrit( require => Package['openjdk-7-jre-headless'], } - if ! defined(Package['gerritlib']) { - package { 'gerritlib': - ensure => latest, - provider => 'pip', - require => Class[pip], - } - } - - if ! defined(Package['python-launchpadlib']) { - package { 'python-launchpadlib': - ensure => present, - } - } - file { '/var/log/gerrit': ensure => directory, owner => 'gerrit2', diff --git a/modules/jeepyb/manifests/init.pp b/modules/jeepyb/manifests/init.pp index c05f08cf88..fb8d8e3021 100644 --- a/modules/jeepyb/manifests/init.pp +++ b/modules/jeepyb/manifests/init.pp @@ -11,30 +11,6 @@ class jeepyb ( } } - if ! defined(Package['PyGithub']) { - package { 'PyGithub': - ensure => latest, - provider => pip, - require => Class['pip'], - } - } - - if ! defined(Package['gerritlib']) { - package { 'gerritlib': - ensure => latest, - provider => pip, - require => Class['pip'], - } - } - - if ! defined(Package['pkginfo']) { - package { 'pkginfo': - ensure => latest, - provider => pip, - require => Class['pip'], - } - } - package { 'gcc': ensure => present, }