Pass hiera sysadmin data to proper class.
The jenkins node includes the jenkins class and zuul class. Hiera sysadmin data should be passed to the jenkins class and not the zuul class. Move the argument to the jenkins class. Change-Id: I0510446991749345d461c59083055a7750aede79 Reviewed-on: https://review.openstack.org/12723 Approved: Clark Boylan <clark.boylan@gmail.com> Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Tested-by: Jenkins
This commit is contained in:
parent
8cb2e3b632
commit
a27164e67b
@ -35,6 +35,7 @@ node "gerrit-dev.openstack.org", "review-dev.openstack.org" {
|
||||
node "jenkins.openstack.org" {
|
||||
class { 'openstack_project::jenkins':
|
||||
jenkins_jobs_password => hiera('jenkins_jobs_password'),
|
||||
sysadmins => hiera('sysadmins'),
|
||||
}
|
||||
class { "openstack_project::zuul":
|
||||
jenkins_server => "https://$fqdn",
|
||||
@ -43,7 +44,6 @@ node "jenkins.openstack.org" {
|
||||
gerrit_server => 'review.openstack.org',
|
||||
gerrit_user => 'jenkins',
|
||||
url_pattern => 'http://logs.openstack.org/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}',
|
||||
sysadmins => hiera('sysadmins'),
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user