From d952ffc64222fd4aef8aa6e5294f22a0f7c948cf Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 7 Jun 2016 15:09:52 -0700 Subject: [PATCH] Decommission jenkins01 Remove jenkins01 from nodepool, zuul, and log processing. Change-Id: I16d329588f3a2dd0043771db1668fac12a15e5d9 Depends-On: I57167afb08a91237c1d5fe7a38544561c8f0968a --- hiera/common.yaml | 1 - manifests/site.pp | 9 --------- .../files/logstash/jenkins-log-client.yaml | 1 - 3 files changed, 11 deletions(-) diff --git a/hiera/common.yaml b/hiera/common.yaml index 1144a51048..6e87b62483 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -292,7 +292,6 @@ cacti_hosts: - health.openstack.org - jenkins-dev.openstack.org - jenkins.openstack.org -- jenkins01.openstack.org - jenkins02.openstack.org - jenkins03.openstack.org - jenkins04.openstack.org diff --git a/manifests/site.pp b/manifests/site.pp index 020632359c..4ae84f04f9 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -781,13 +781,6 @@ node 'nodepool.openstack.org' { builder_logging_conf_template => 'openstack_project/nodepool/nodepool-builder.logging.conf.erb', upload_workers => '16', jenkins_masters => [ - { - name => 'jenkins01', - url => 'https://jenkins01.openstack.org/', - user => hiera('jenkins_api_user', 'username'), - apikey => hiera('jenkins_api_key'), - credentials => hiera('jenkins_credentials_id'), - }, { name => 'jenkins02', url => 'https://jenkins02.openstack.org/', @@ -869,7 +862,6 @@ node 'zuul.openstack.org' { gearman_workers => [ 'nodepool.openstack.org', 'jenkins.openstack.org', - 'jenkins01.openstack.org', 'jenkins02.openstack.org', 'jenkins03.openstack.org', 'jenkins04.openstack.org', @@ -970,7 +962,6 @@ node 'zuul-dev.openstack.org' { statsd_host => 'graphite.openstack.org', gearman_workers => [ 'jenkins.openstack.org', - 'jenkins01.openstack.org', 'jenkins02.openstack.org', 'jenkins03.openstack.org', 'jenkins04.openstack.org', diff --git a/modules/openstack_project/files/logstash/jenkins-log-client.yaml b/modules/openstack_project/files/logstash/jenkins-log-client.yaml index c53c209f15..36f2c0fc33 100644 --- a/modules/openstack_project/files/logstash/jenkins-log-client.yaml +++ b/modules/openstack_project/files/logstash/jenkins-log-client.yaml @@ -3,7 +3,6 @@ source-url: http://logs.openstack.org # List of zmq event inputs. zmq-publishers: - tcp://jenkins.openstack.org:8888 - - tcp://jenkins01.openstack.org:8888 - tcp://jenkins02.openstack.org:8888 - tcp://jenkins03.openstack.org:8888 - tcp://jenkins04.openstack.org:8888