opendev/system-config
Code Issues Proposed changes

Expose jenkins_gitfullname and jenkins_gitemail

Browse Source 
Jenkins is consuming git user and email from jenkinsuser
parameters. But these parameters are not exposed on
OpenStack manifests.
Update all the manifests where it's relevant to send
that git username and email, either to jenkins slaves
or to static servers where jenkinsuser is needed.

Change-Id: I4e2b94b1220f88288401f9106721bc4df7fe9125
This commit is contained in:
Yolanda Robla 2015-03-05 13:28:05 +01:00
parent 265613ebe3
commit 4b213ccb36
6 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openstack_project/manifests/proposal_slave.pp
View File

@ -9,10 +9,14 @@ class openstack_project::proposal_slave (
$proposal_ssh_private_key, $proposal_ssh_private_key,
$transifex_password = '', $transifex_password = '',
$transifex_username = 'openstackci', $transifex_username = 'openstackci',
$jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org',
) { ) {
class { 'openstack_project::slave': class { 'openstack_project::slave':
ssh_key => $jenkins_ssh_public_key, ssh_key => $jenkins_ssh_public_key,
jenkins_gitfullname => $jenkins_gitfullname,
jenkins_gitemail => $jenkins_gitemail,
} }
package { ['transifex-client', 'Babel']: package { ['transifex-client', 'Babel']:

6
modules/openstack_project/manifests/pypi_slave.pp
View File

@ -25,9 +25,13 @@ class openstack_project::pypi_slave (
$mavencentral_password, $mavencentral_password,
$puppet_forge_username, $puppet_forge_username,
$puppet_forge_password, $puppet_forge_password,
$jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org',
) { ) {
class { 'openstack_project::slave': class { 'openstack_project::slave':
ssh_key => $jenkins_ssh_public_key, ssh_key => $jenkins_ssh_public_key,
jenkins_gitfullname => $jenkins_gitfullname,
jenkins_gitemail => $jenkins_gitemail,
} }
include pip include pip

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

@ -16,6 +16,8 @@ class openstack_project::single_use_slave (
$all_mysql_privs = false, $all_mysql_privs = false,
$enable_unbound = true, $enable_unbound = true,
$ssh_key = $openstack_project::jenkins_ssh_key, $ssh_key = $openstack_project::jenkins_ssh_key,
$jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org',
$project_config_repo = 'https://git.openstack.org/openstack-infra/project-config', $project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
) inherits openstack_project { ) inherits openstack_project {
class { 'openstack_project::template': class { 'openstack_project::template':
@ -40,6 +42,8 @@ class openstack_project::single_use_slave (
} }
class { 'jenkins::slave': class { 'jenkins::slave':
ssh_key => $ssh_key, ssh_key => $ssh_key,
gitfullname => $jenkins_gitfullname,
gitemail => $jenkins_gitemail,
} }
class { 'openstack_project::slave_common': class { 'openstack_project::slave_common':

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

@ -5,6 +5,8 @@ class openstack_project::slave (
$certname = $::fqdn, $certname = $::fqdn,
$ssh_key = '', $ssh_key = '',
$sysadmins = [], $sysadmins = [],
$jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org',
) { ) {
include openstack_project include openstack_project
@ -19,6 +21,8 @@ class openstack_project::slave (
class { 'jenkins::slave': class { 'jenkins::slave':
ssh_key => $ssh_key, ssh_key => $ssh_key,
gitfullname => $jenkins_gitfullname,
gitemail => $jenkins_gitemail,
} }
include jenkins::cgroups include jenkins::cgroups

6
modules/openstack_project/manifests/static.pp
View File

@ -9,6 +9,8 @@ class openstack_project::static (
$swift_region_name = '', $swift_region_name = '',
$swift_default_container = '', $swift_default_container = '',
$project_config_repo = '', $project_config_repo = '',
$jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org',
) { ) {
class { 'openstack_project::server': class { 'openstack_project::server':
@ -22,7 +24,9 @@ class openstack_project::static (
include openstack_project include openstack_project
class { 'jenkins::jenkinsuser': class { 'jenkins::jenkinsuser':
ssh_key => $openstack_project::jenkins_ssh_key, ssh_key => $openstack_project::jenkins_ssh_key,
gitfullname => $jenkins_gitfullname,
gitemail => $jenkins_gitemail,
} }
include apache include apache

4
modules/openstack_project/manifests/status.pp
View File

@ -15,6 +15,8 @@ class openstack_project::status (
$status_base_url = 'http://status.openstack.org/', $status_base_url = 'http://status.openstack.org/',
$status_title = 'OpenStack', $status_title = 'OpenStack',
$graphite_render_url = 'http://graphite.openstack.org/render/', $graphite_render_url = 'http://graphite.openstack.org/render/',
$jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org',
) { ) {
class { 'openstack_project::server': class { 'openstack_project::server':
@ -25,6 +27,8 @@ class openstack_project::status (
include openstack_project include openstack_project
class { 'jenkins::jenkinsuser': class { 'jenkins::jenkinsuser':
ssh_key => $openstack_project::jenkins_ssh_key, ssh_key => $openstack_project::jenkins_ssh_key,
gitfullname => $jenkins_gitfullname,
gitemail => $jenkins_gitemail,
} }
include apache include apache