From d1dd7418e72abefc86e1f9c2e4329927ec94e5e7 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Thu, 16 Jun 2016 13:30:16 -0700
Subject: [PATCH] Decomission jenkins05 - jenkins07
These are our final jenkins masters.
Change-Id: I89d0bb25088c9e3fa8bab51175b241302bd9a97d
Depends-On: I6c8c3ac41f2d5fb3887d86ec5e1ecddc8273109f
---
hiera/common.yaml | 3 --
manifests/site.pp | 33 ++-----------------
.../files/logstash/jenkins-log-client.yaml | 3 --
3 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/hiera/common.yaml b/hiera/common.yaml
index 2447633bc3..6f7269a155 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -292,9 +292,6 @@ cacti_hosts:
- groups-dev.openstack.org
- groups.openstack.org
- health.openstack.org
-- jenkins05.openstack.org
-- jenkins06.openstack.org
-- jenkins07.openstack.org
- kdc01.openstack.org
- kdc02.openstack.org
- lists.openstack.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 907dfbd25e..de85fc925b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -728,29 +728,7 @@ node 'nodepool.openstack.org' {
logging_conf_template => 'openstack_project/nodepool/nodepool.logging.conf.erb',
builder_logging_conf_template => 'openstack_project/nodepool/nodepool-builder.logging.conf.erb',
upload_workers => '16',
- jenkins_masters => [
- {
- name => 'jenkins05',
- url => 'https://jenkins05.openstack.org/',
- user => hiera('jenkins_api_user', 'username'),
- apikey => hiera('jenkins_api_key'),
- credentials => hiera('jenkins_credentials_id'),
- },
- {
- name => 'jenkins06',
- url => 'https://jenkins06.openstack.org/',
- user => hiera('jenkins_api_user', 'username'),
- apikey => hiera('jenkins_api_key'),
- credentials => hiera('jenkins_credentials_id'),
- },
- {
- name => 'jenkins07',
- url => 'https://jenkins07.openstack.org/',
- user => hiera('jenkins_api_user', 'username'),
- apikey => hiera('jenkins_api_key'),
- credentials => hiera('jenkins_credentials_id'),
- },
- ],
+ jenkins_masters => [],
}
file { '/home/nodepool/.config/openstack/infracloud_west_cacert.pem':
ensure => present,
@@ -788,9 +766,6 @@ node 'zuul.openstack.org' {
statsd_host => 'graphite.openstack.org',
gearman_workers => [
'nodepool.openstack.org',
- 'jenkins05.openstack.org',
- 'jenkins06.openstack.org',
- 'jenkins07.openstack.org',
'zlstatic01.openstack.org',
'zl01.openstack.org',
'zl02.openstack.org',
@@ -890,11 +865,7 @@ node 'zuul-dev.openstack.org' {
zuul_url => 'http://zuul-dev.openstack.org/p',
sysadmins => hiera('sysadmins', []),
statsd_host => 'graphite.openstack.org',
- gearman_workers => [
- 'jenkins05.openstack.org',
- 'jenkins06.openstack.org',
- 'jenkins07.openstack.org',
- ],
+ gearman_workers => [],
}
}
diff --git a/modules/openstack_project/files/logstash/jenkins-log-client.yaml b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
index 7186f46db5..4b111c9eef 100644
--- a/modules/openstack_project/files/logstash/jenkins-log-client.yaml
+++ b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
@@ -2,9 +2,6 @@ source-url: http://logs.openstack.org
# List of zmq event inputs.
zmq-publishers:
- - tcp://jenkins05.openstack.org:8888
- - tcp://jenkins06.openstack.org:8888
- - tcp://jenkins07.openstack.org:8888
- tcp://zlstatic01.openstack.org:8888
- tcp://zl01.openstack.org:8888
- tcp://zl02.openstack.org:8888