opendev/system-config
Code Issues Proposed changes

Add three new jenkins servers

Browse Source 
Change-Id: I1143c1c7446890c47be12d8b115560bddadc1919
This commit is contained in:
Monty Taylor 2014-01-22 09:12:39 -08:00 committed by Anita Kuno
parent 6cb0650bae
commit 2dfcf4fb71
4 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
manifests/site.pp
View File

@ -133,6 +133,48 @@ node 'jenkins04.openstack.org' {
}
}
node 'jenkins05.openstack.org' {
class { 'openstack_project::jenkins':
jenkins_jobs_password => hiera('jenkins_jobs_password'),
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
ssl_cert_file_contents => hiera('jenkins05_ssl_cert_file_contents'),
ssl_key_file_contents => hiera('jenkins05_ssl_key_file_contents'),
ssl_chain_file_contents => hiera('jenkins05_ssl_chain_file_contents'),
sysadmins => hiera('sysadmins'),
zmq_event_receivers => ['logstash.openstack.org',
'nodepool.openstack.org',
],
}
}
node 'jenkins06.openstack.org' {
class { 'openstack_project::jenkins':
jenkins_jobs_password => hiera('jenkins_jobs_password'),
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
ssl_cert_file_contents => hiera('jenkins06_ssl_cert_file_contents'),
ssl_key_file_contents => hiera('jenkins06_ssl_key_file_contents'),
ssl_chain_file_contents => hiera('jenkins06_ssl_chain_file_contents'),
sysadmins => hiera('sysadmins'),
zmq_event_receivers => ['logstash.openstack.org',
'nodepool.openstack.org',
],
}
}
node 'jenkins07.openstack.org' {
class { 'openstack_project::jenkins':
jenkins_jobs_password => hiera('jenkins_jobs_password'),
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
ssl_cert_file_contents => hiera('jenkins07_ssl_cert_file_contents'),
ssl_key_file_contents => hiera('jenkins07_ssl_key_file_contents'),
ssl_chain_file_contents => hiera('jenkins07_ssl_chain_file_contents'),
sysadmins => hiera('sysadmins'),
zmq_event_receivers => ['logstash.openstack.org',
'nodepool.openstack.org',
],
}
}
node 'jenkins-dev.openstack.org' {
class { 'openstack_project::jenkins_dev':
jenkins_ssh_private_key => hiera('jenkins_dev_ssh_private_key_contents'),
@ -458,6 +500,9 @@ node 'zuul.openstack.org' {
'jenkins02.openstack.org',
'jenkins03.openstack.org',
'jenkins04.openstack.org',
'jenkins05.openstack.org',
'jenkins06.openstack.org',
'jenkins07.openstack.org',
'jenkins-dev.openstack.org',
],
}
@ -478,6 +523,9 @@ node 'zuul-dev.openstack.org' {
'jenkins02.openstack.org',
'jenkins03.openstack.org',
'jenkins04.openstack.org',
'jenkins05.openstack.org',
'jenkins06.openstack.org',
'jenkins07.openstack.org',
'jenkins-dev.openstack.org',
],
}

3
modules/openstack_project/files/logstash/jenkins-log-client.yaml
View File

@ -7,6 +7,9 @@ zmq-publishers:
- tcp://jenkins02.openstack.org:8888
- tcp://jenkins03.openstack.org:8888
- tcp://jenkins04.openstack.org:8888
- tcp://jenkins05.openstack.org:8888
- tcp://jenkins06.openstack.org:8888
- tcp://jenkins07.openstack.org:8888
# List of files to source logs from.
source-files:

3
modules/openstack_project/manifests/cacti.pp
View File

@ -78,6 +78,9 @@ class openstack_project::cacti (
'jenkins02.openstack.org',
'jenkins03.openstack.org',
'jenkins04.openstack.org',
'jenkins05.openstack.org',
'jenkins06.openstack.org',
'jenkins07.openstack.org',
'jenkins-dev.openstack.org',
'lists.openstack.org',
'logstash.openstack.org',

3
modules/openstack_project/templates/nodepool/nodepool.yaml.erb
View File

@ -11,6 +11,9 @@ zmq-publishers:
- tcp://jenkins02.openstack.org:8888
- tcp://jenkins03.openstack.org:8888
- tcp://jenkins04.openstack.org:8888
- tcp://jenkins05.openstack.org:8888
- tcp://jenkins06.openstack.org:8888
- tcp://jenkins07.openstack.org:8888
gearman-servers:
- host: zuul.openstack.org