opendev/system-config
Code Issues Proposed changes

Merge "Pass project_config_repo from single_use_slave"

Browse Source
This commit is contained in:
Jenkins 2014-12-02 14:06:21 +00:00 committed by Gerrit Code Review
commit a09c1dc2c2
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openstack_project/manifests/single_use_slave.pp
View File

@ -17,7 +17,8 @@ class openstack_project::single_use_slave (
$automatic_upgrades = false,
$all_mysql_privs = false,
$enable_unbound = true,
$ssh_key = $openstack_project::jenkins_ssh_key
$ssh_key = $openstack_project::jenkins_ssh_key,
$project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
) inherits openstack_project {
class { 'openstack_project::template':
certname => $certname,
@ -44,8 +45,9 @@ class openstack_project::single_use_slave (
}
class { 'openstack_project::slave_common':
include_pypy => $include_pypy,
sudo => $sudo,
include_pypy => $include_pypy,
sudo => $sudo,
project_config_repo => $project_config_repo,
}
if (! $thin) {

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

@ -5,7 +5,7 @@
class openstack_project::slave_common(
$include_pypy = false,
$sudo = false,
$project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
$project_config_repo = '',
){
vcsrepo { '/opt/requirements':
ensure => latest,