opendev/system-config
Code Issues Proposed changes

Remove circular pip dependency in pypi mirror.

Browse Source 
Instead, create a dependency in the script that requires pip
so that it's clear why pip is included.

Change-Id: I063e622836d6a0c62cc77d8527bef3cf93657648
Reviewed-on: https://review.openstack.org/15044
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2012-10-30 17:46:40 +01:00 committed by Jenkins
parent 512a3303a8
commit 186ee20ab3
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/pypimirror/manifests/init.pp
View File

@ -16,12 +16,6 @@ class pypimirror(
ensure => 'present'
}
package { 'pip':
ensure => present,
provider => 'pip',
require => Class[pip]
}
file { '/usr/local/mirror_scripts':
ensure => directory,
mode => '0755',
@ -63,7 +57,8 @@ class pypimirror(
owner => 'root',
group => 'root',
content => template('pypimirror/run-mirror.sh.erb'),
require => File['/usr/local/mirror_scripts'],
require => [File['/usr/local/mirror_scripts'],
Class[pip]],
}
file { '/usr/local/mirror_scripts/run_mirror.py':