opendev/system-config
Code Issues Proposed changes

Remove /opt/zuul-env from slave_common.pp

Browse Source 
We now manage it from a DIB element.

Change-Id: Ia1d430bc1c60076b8c2d1101c74077210a933964
Depends-On: Ie1b4a29a7496c862c14417344b8d51aef779e104
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger
2017-04-12 17:45:51 -04:00
parent 5198ae742c
commit d85e0140d7
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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'],
}
}

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

@@ -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'],
}
}