From 184a8941ee0a130eda585e4adb98b22bc0bb05e6 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 31 Oct 2013 16:02:10 -0400 Subject: [PATCH] Switch from jeepyb to pypi-mirror We've got a new mirror building project called pypi-mirror. In addition to the old behavior, it also now creates wheels and uploads them. Use it. Change-Id: Ic63a2e11ba60e1d99809a8a38f7a27072a34b0c2 --- .../manifests/mirror_slave.pp | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/manifests/mirror_slave.pp b/modules/openstack_project/manifests/mirror_slave.pp index 192c14a379..9e72aa9949 100644 --- a/modules/openstack_project/manifests/mirror_slave.pp +++ b/modules/openstack_project/manifests/mirror_slave.pp @@ -25,8 +25,6 @@ class openstack_project::mirror_slave ( python3 => $python3, } - include jeepyb - file { '/home/jenkins/.ssh/id_rsa': owner => 'jenkins', group => 'jenkins', @@ -73,4 +71,23 @@ class openstack_project::mirror_slave ( require => File['/home/jenkins/pypimirror/etc'], } + file { '/opt/jeepyb': + ensure => absent, + } + + vcsrepo { '/opt/pypi-mirror': + ensure => latest, + provider => git, + revision => 'master', + source => 'https://git.openstack.org/openstack-infra/pypi-mirror', + } + + exec { 'install_pypi_mirror' : + command => 'pip install .', + cwd => '/opt/pypi-mirror', + path => '/usr/local/bin:/bin:/usr/bin', + refreshonly => true, + subscribe => Vcsrepo['/opt/pypi-mirror'], + } + }