diff --git a/modules/jenkins_slave/files/pip.conf b/modules/jenkins_slave/files/pip.conf new file mode 100644 index 0000000000..57f63b54d9 --- /dev/null +++ b/modules/jenkins_slave/files/pip.conf @@ -0,0 +1,3 @@ +[global] +index-url = http://pypi.openstack.org +extra-index-url = http://pypi.python.org/simple diff --git a/modules/jenkins_slave/files/pydistutils.cfg b/modules/jenkins_slave/files/pydistutils.cfg new file mode 100644 index 0000000000..9d1de1569f --- /dev/null +++ b/modules/jenkins_slave/files/pydistutils.cfg @@ -0,0 +1,2 @@ +[easy_install] +index_url = http://pypi.openstack.org diff --git a/modules/jenkins_slave/manifests/jenkinsuser.pp b/modules/jenkins_slave/manifests/jenkinsuser.pp index 978f01d2c6..f71d3b91f2 100644 --- a/modules/jenkins_slave/manifests/jenkinsuser.pp +++ b/modules/jenkins_slave/manifests/jenkinsuser.pp @@ -23,7 +23,34 @@ define jenkinsuser($ensure = present, $ssh_key) { require => User['jenkins'] } - + file { 'jenkinspipdir': + name => '/home/jenkins/.pip', + owner => 'jenkins', + group => 'jenkins', + ensure => 'directory', + require => File['jenkinshome'], + } + + file { 'jenkinspipconf': + name => '/home/jenkins/.pip/pip.conf', + owner => 'jenkins', + group => 'jenkins', + mode => 640, + ensure => 'present', + source => "puppet:///modules/jenkins_slave/pip.conf", + require => File['jenkinspipdir'], + } + + file { 'jenkinspydistutilscfg': + name => '/home/jenkins/.pydistutils.cfg', + owner => 'jenkins', + group => 'jenkins', + mode => 640, + ensure => 'present', + source => "puppet:///modules/jenkins_slave/pydistutils.cfg", + require => File['jenkinshome'], + } + file { 'jenkinssshdir': name => '/home/jenkins/.ssh', owner => 'jenkins',