From a62c602aaca17a6ff9edc78dd97faea04a9098a1 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 1 Mar 2013 14:16:00 -0800 Subject: [PATCH] Revert "Use b.pypi.python.org pypi mirror instead of pypi." This reverts commit 1bac2431714b12fe6a2cd4adc830941710a722ff. Turns out b.pypi.python.org is not a very complete mirror and ends up creating new problems. Stop using it. Change-Id: I640fad26cd8bd2546f73de460fd0dd944484d843 Reviewed-on: https://review.openstack.org/23321 Reviewed-by: Jeremy Stanley Reviewed-by: James E. Blair Approved: James E. Blair Tested-by: Jenkins --- modules/jenkins/files/pip.conf | 2 +- modules/jenkins/files/pydistutils.cfg | 2 +- modules/jenkins/manifests/jenkinsuser.pp | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/jenkins/files/pip.conf b/modules/jenkins/files/pip.conf index b44251dc7c..57f63b54d9 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://b.pypi.python.org/simple +extra-index-url = http://pypi.python.org/simple diff --git a/modules/jenkins/files/pydistutils.cfg b/modules/jenkins/files/pydistutils.cfg index 13dda2a10f..9d1de1569f 100644 --- a/modules/jenkins/files/pydistutils.cfg +++ b/modules/jenkins/files/pydistutils.cfg @@ -1,2 +1,2 @@ [easy_install] -index_url = http://b.pypi.python.org/simple +index_url = http://pypi.openstack.org diff --git a/modules/jenkins/manifests/jenkinsuser.pp b/modules/jenkins/manifests/jenkinsuser.pp index d355cbda6a..fd6b31ee26 100644 --- a/modules/jenkins/manifests/jenkinsuser.pp +++ b/modules/jenkins/manifests/jenkinsuser.pp @@ -52,11 +52,7 @@ class jenkins::jenkinsuser( } file { '/home/jenkins/.pydistutils.cfg': - ensure => present, - owner => 'jenkins', - group => 'jenkins', - mode => '0640', - source => 'puppet:///modules/jenkins/pydistutils.cfg', + ensure => absent, require => File['/home/jenkins'], }