From 70b38eacebed9cafdea977d6600086cec57eb8fe Mon Sep 17 00:00:00 2001 From: Arx Cruz Date: Wed, 18 Sep 2013 13:09:01 +0000 Subject: [PATCH] Adds support to specify a different jenkis_jobs_builder username Add the possibility to choose another username for jenkins_jobs_builder script. If you use another authentication method (LDAP for example), and the username is an email, the jenkins_job_builder fails, since gerrig isn't a valid user in the LDAP directory. This won't break the actual configuration. If the user don't set the jenkins_jobs_username, it will continue to use gerrig as default. Change-Id: I990cf15c4c583d3041725e8c8f1bd9beb29e0d0f --- modules/openstack_project/manifests/jenkins.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/openstack_project/manifests/jenkins.pp b/modules/openstack_project/manifests/jenkins.pp index c2a10fb4f5..d4731f61d3 100644 --- a/modules/openstack_project/manifests/jenkins.pp +++ b/modules/openstack_project/manifests/jenkins.pp @@ -3,6 +3,7 @@ class openstack_project::jenkins ( $vhost_name = $::fqdn, $jenkins_jobs_password = '', + $jenkins_jobs_username = 'gerrig', # This is not a typo, well it isn't anymore. $manage_jenkins_jobs = true, $ssl_cert_file_contents = '', $ssl_key_file_contents = '', @@ -140,7 +141,7 @@ class openstack_project::jenkins ( if $manage_jenkins_jobs == true { class { '::jenkins::job_builder': url => "https://${vhost_name}/", - username => 'gerrig', # This is not a typo, well it isn't anymore. + username => $jenkins_jobs_username, password => $jenkins_jobs_password, }