From ba2b36bad4134df6cac6cb7340b9d16b25f67266 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 29 Jun 2015 10:20:39 -0400 Subject: [PATCH] Add slave-common to long lived slaves We need the jenkins slave scripts on these too. Change-Id: I25ef6bf730cba1e0aee0b027d1517dd4636c8b47 --- modules/openstack_project/manifests/proposal_slave.pp | 2 ++ modules/openstack_project/manifests/pypi_slave.pp | 2 ++ modules/openstack_project/manifests/slave.pp | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/openstack_project/manifests/proposal_slave.pp b/modules/openstack_project/manifests/proposal_slave.pp index 2a43e520ff..3f20a6053b 100644 --- a/modules/openstack_project/manifests/proposal_slave.pp +++ b/modules/openstack_project/manifests/proposal_slave.pp @@ -11,6 +11,7 @@ class openstack_project::proposal_slave ( $transifex_username = 'openstackci', $jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitemail = 'jenkins@openstack.org', + $project_config_repo = 'https://git.openstack.org/openstack-infra/project-config', ) { include zanata::client @@ -18,6 +19,7 @@ class openstack_project::proposal_slave ( ssh_key => $jenkins_ssh_public_key, jenkins_gitfullname => $jenkins_gitfullname, jenkins_gitemail => $jenkins_gitemail, + project_config_repo => $project_config_repo, } package { ['transifex-client', 'Babel']: diff --git a/modules/openstack_project/manifests/pypi_slave.pp b/modules/openstack_project/manifests/pypi_slave.pp index c67827e551..a8dba4e52c 100644 --- a/modules/openstack_project/manifests/pypi_slave.pp +++ b/modules/openstack_project/manifests/pypi_slave.pp @@ -27,11 +27,13 @@ class openstack_project::pypi_slave ( $puppet_forge_password, $jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitemail = 'jenkins@openstack.org', + $project_config_repo = 'https://git.openstack.org/openstack-infra/project-config', ) { class { 'openstack_project::slave': ssh_key => $jenkins_ssh_public_key, jenkins_gitfullname => $jenkins_gitfullname, jenkins_gitemail => $jenkins_gitemail, + project_config_repo => $project_config_repo, } include pip diff --git a/modules/openstack_project/manifests/slave.pp b/modules/openstack_project/manifests/slave.pp index c11cd7e8fd..7acdf98697 100644 --- a/modules/openstack_project/manifests/slave.pp +++ b/modules/openstack_project/manifests/slave.pp @@ -7,6 +7,7 @@ class openstack_project::slave ( $sysadmins = [], $jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitemail = 'jenkins@openstack.org', + $project_config_repo = 'https://git.openstack.org/openstack-infra/project-config', ) { include openstack_project @@ -34,7 +35,9 @@ class openstack_project::slave ( limit_value => '256' } - include openstack_project::slave_common + class { 'openstack_project::slave_common': + project_config_repo => $project_config_repo, + } if (! $thin) { include openstack_project::thick_slave