opendev/system-config
Code Issues Proposed changes

Merge "Update zuul-env on job nodes"

Browse Source
This commit is contained in:
Jenkins 2016-08-24 21:26:19 +00:00 committed by Gerrit Code Review
commit c729730b5d
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/openstack_project/files/zuul-env-reqs.txt
View File

@ -1 +0,0 @@
-e git+https://git.openstack.org/openstack-infra/zuul#egg=zuul

20
modules/openstack_project/manifests/slave_common.pp
View File

@ -144,20 +144,24 @@ class openstack_project::slave_common(
} }
} }
file { '/etc/zuul-env-reqs.txt': vcsrepo { '/opt/zuul':
ensure => present, ensure => latest,
owner => 'root', provider => git,
group => 'root', revision => 'master',
mode => '0444', source => 'https://git.openstack.org/openstack-infra/zuul.git',
source => 'puppet:///modules/openstack_project/zuul-env-reqs.txt',
} }
python::virtualenv { '/usr/zuul-env': python::virtualenv { '/usr/zuul-env':
ensure => present, ensure => present,
requirements => '/etc/zuul-env-reqs.txt',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
timeout => 0, timeout => 0,
require => File['/etc/zuul-env-reqs.txt'], }
exec { 'zuul-env-update':
command => '/usr/zuul-env/bin/pip --log /usr/zuul-env/pip.log install /opt/zuul',
refreshonly => true,
subscribe => Vcsrepo['/opt/zuul'],
require => Python::Virtualenv['/usr/zuul-env'],
} }
} }