From 1bac2431714b12fe6a2cd4adc830941710a722ff Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 20 Feb 2013 14:26:43 -0800 Subject: [PATCH] Use b.pypi.python.org pypi mirror instead of pypi. Force easy_install to use b.pypi.python.org instead of pypi.python.org. Make pip fall back on b.pypi.python.org instead of pypi.python.org. Pypi proper has been extremely flaky lately. Use and an alternative to try and avoid this flakiness. Change-Id: I027f31bc30676b6f8cdc6342173263781251191d Reviewed-on: https://review.openstack.org/22492 Reviewed-by: Jeremy Stanley Reviewed-by: James E. Blair Approved: Jeremy Stanley Tested-by: Jenkins --- modules/jenkins/files/pip.conf | 2 +- modules/jenkins/files/pydistutils.cfg | 2 +- modules/jenkins/manifests/jenkinsuser.pp | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/jenkins/files/pip.conf b/modules/jenkins/files/pip.conf index 57f63b54d9..b44251dc7c 100644 --- a/modules/jenkins/files/pip.conf +++ b/modules/jenkins/files/pip.conf @@ -1,3 +1,3 @@ [global] index-url = http://pypi.openstack.org -extra-index-url = http://pypi.python.org/simple +extra-index-url = http://b.pypi.python.org/simple diff --git a/modules/jenkins/files/pydistutils.cfg b/modules/jenkins/files/pydistutils.cfg index 9d1de1569f..13dda2a10f 100644 --- a/modules/jenkins/files/pydistutils.cfg +++ b/modules/jenkins/files/pydistutils.cfg @@ -1,2 +1,2 @@ [easy_install] -index_url = http://pypi.openstack.org +index_url = http://b.pypi.python.org/simple diff --git a/modules/jenkins/manifests/jenkinsuser.pp b/modules/jenkins/manifests/jenkinsuser.pp index fd6b31ee26..d355cbda6a 100644 --- a/modules/jenkins/manifests/jenkinsuser.pp +++ b/modules/jenkins/manifests/jenkinsuser.pp @@ -52,7 +52,11 @@ class jenkins::jenkinsuser( } file { '/home/jenkins/.pydistutils.cfg': - ensure => absent, + ensure => present, + owner => 'jenkins', + group => 'jenkins', + mode => '0640', + source => 'puppet:///modules/jenkins/pydistutils.cfg', require => File['/home/jenkins'], }