diff --git a/modules/openstack_project/manifests/slave.pp b/modules/openstack_project/manifests/slave.pp index 36132715d8..af0d0ddac3 100644 --- a/modules/openstack_project/manifests/slave.pp +++ b/modules/openstack_project/manifests/slave.pp @@ -86,4 +86,24 @@ class openstack_project::slave ( include openstack_project::thick_slave } + vcsrepo { '/opt/zuul': + ensure => latest, + provider => git, + revision => 'master', + source => 'https://git.openstack.org/openstack-infra/zuul.git', + } + + python::virtualenv { '/usr/zuul-env': + ensure => present, + owner => 'root', + group => 'root', + timeout => 0, + } + + 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'], + } } diff --git a/modules/openstack_project/manifests/slave_common.pp b/modules/openstack_project/manifests/slave_common.pp index cbb82f005a..8df310f559 100644 --- a/modules/openstack_project/manifests/slave_common.pp +++ b/modules/openstack_project/manifests/slave_common.pp @@ -31,25 +31,4 @@ class openstack_project::slave_common( group => 'root', mode => '0440', } - - vcsrepo { '/opt/zuul': - ensure => latest, - provider => git, - revision => 'master', - source => 'https://git.openstack.org/openstack-infra/zuul.git', - } - - python::virtualenv { '/usr/zuul-env': - ensure => present, - owner => 'root', - group => 'root', - timeout => 0, - } - - 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'], - } }