opendev/system-config
Code Issues Proposed changes

Decomission jenkins03 and jenkins04

Browse Source 
Change-Id: I890bd8e69706b656b4d2d04dd83e556cb26021fa
This commit is contained in:
James E. Blair 2016-06-15 13:13:37 -07:00
parent 99b0711671
commit 4e0a9ab7f8
3 changed files with 0 additions and 22 deletions
hiera
common.yaml
manifests
site.pp
modules/openstack_project/files/logstash
jenkins-log-client.yaml

2
hiera/common.yaml

@ -294,8 +294,6 @@ cacti_hosts:
- health.openstack.org - health.openstack.org
- jenkins-dev.openstack.org - jenkins-dev.openstack.org
- jenkins.openstack.org - jenkins.openstack.org
- jenkins03.openstack.org
- jenkins04.openstack.org
- jenkins05.openstack.org - jenkins05.openstack.org
- jenkins06.openstack.org - jenkins06.openstack.org
- jenkins07.openstack.org - jenkins07.openstack.org

18
manifests/site.pp

@ -781,20 +781,6 @@ node 'nodepool.openstack.org' {
builder_logging_conf_template => 'openstack_project/nodepool/nodepool-builder.logging.conf.erb', builder_logging_conf_template => 'openstack_project/nodepool/nodepool-builder.logging.conf.erb',
upload_workers => '16', upload_workers => '16',
jenkins_masters => [ jenkins_masters => [
{
name => 'jenkins03',
url => 'https://jenkins03.openstack.org/',
user => hiera('jenkins_api_user', 'username'),
apikey => hiera('jenkins_api_key'),
credentials => hiera('jenkins_credentials_id'),
},
{
name => 'jenkins04',
url => 'https://jenkins04.openstack.org/',
user => hiera('jenkins_api_user', 'username'),
apikey => hiera('jenkins_api_key'),
credentials => hiera('jenkins_credentials_id'),
},
{ {
name => 'jenkins05', name => 'jenkins05',
url => 'https://jenkins05.openstack.org/', url => 'https://jenkins05.openstack.org/',
@ -855,8 +841,6 @@ node 'zuul.openstack.org' {
gearman_workers => [ gearman_workers => [
'nodepool.openstack.org', 'nodepool.openstack.org',
'jenkins.openstack.org', 'jenkins.openstack.org',
'jenkins03.openstack.org',
'jenkins04.openstack.org',
'jenkins05.openstack.org', 'jenkins05.openstack.org',
'jenkins06.openstack.org', 'jenkins06.openstack.org',
'jenkins07.openstack.org', 'jenkins07.openstack.org',
@ -959,8 +943,6 @@ node 'zuul-dev.openstack.org' {
statsd_host => 'graphite.openstack.org', statsd_host => 'graphite.openstack.org',
gearman_workers => [ gearman_workers => [
'jenkins.openstack.org', 'jenkins.openstack.org',
'jenkins03.openstack.org',
'jenkins04.openstack.org',
'jenkins05.openstack.org', 'jenkins05.openstack.org',
'jenkins06.openstack.org', 'jenkins06.openstack.org',
'jenkins07.openstack.org', 'jenkins07.openstack.org',

2
modules/openstack_project/files/logstash/jenkins-log-client.yaml

@ -3,8 +3,6 @@ source-url: http://logs.openstack.org
# List of zmq event inputs. # List of zmq event inputs.
zmq-publishers: zmq-publishers:
- tcp://jenkins.openstack.org:8888 - tcp://jenkins.openstack.org:8888
- tcp://jenkins03.openstack.org:8888
- tcp://jenkins04.openstack.org:8888
- tcp://jenkins05.openstack.org:8888 - tcp://jenkins05.openstack.org:8888
- tcp://jenkins06.openstack.org:8888 - tcp://jenkins06.openstack.org:8888
- tcp://jenkins07.openstack.org:8888 - tcp://jenkins07.openstack.org:8888