From e9866dbac761f762b06924f12f206aba06f4ac2f Mon Sep 17 00:00:00 2001 From: David Shrewsbury Date: Mon, 21 May 2012 21:35:08 -0400 Subject: [PATCH] Remove existing .pydistutils.cfg until mirror. Python package installation using distutils/easy_install can fail if using our PyPi mirror. Remove use of our mirror until we can resolve mirroring issues. Change-Id: Ic46a05263e255460dd61213b677a7d7d2894fa60 --- modules/jenkins_slave/manifests/jenkinsuser.pp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/jenkins_slave/manifests/jenkinsuser.pp b/modules/jenkins_slave/manifests/jenkinsuser.pp index f71d3b91f2..83512898f3 100644 --- a/modules/jenkins_slave/manifests/jenkinsuser.pp +++ b/modules/jenkins_slave/manifests/jenkinsuser.pp @@ -43,11 +43,7 @@ define jenkinsuser($ensure = present, $ssh_key) { file { 'jenkinspydistutilscfg': name => '/home/jenkins/.pydistutils.cfg', - owner => 'jenkins', - group => 'jenkins', - mode => 640, - ensure => 'present', - source => "puppet:///modules/jenkins_slave/pydistutils.cfg", + ensure => 'absent', require => File['jenkinshome'], }