From 5ea1a43d56f78822cbfc3808ad91c247efa8d93b Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Wed, 15 Jun 2016 13:17:57 -0700
Subject: [PATCH] Decomission jenkins.openstack.org

Change-Id: Ibb6115ca391b76f9be26660c073447931dc283b0
---
 hiera/common.yaml                             |  1 -
 manifests/site.pp                             | 28 -------------------
 .../files/logstash/jenkins-log-client.yaml    |  1 -
 3 files changed, 30 deletions(-)

diff --git a/hiera/common.yaml b/hiera/common.yaml
index f335f97751..501743924c 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -293,7 +293,6 @@ cacti_hosts:
 - groups.openstack.org
 - health.openstack.org
 - jenkins-dev.openstack.org
-- jenkins.openstack.org
 - jenkins05.openstack.org
 - jenkins06.openstack.org
 - jenkins07.openstack.org
diff --git a/manifests/site.pp b/manifests/site.pp
index df3e390038..70133818cc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -136,32 +136,6 @@ node 'stackalytics.openstack.org' {
   }
 }
 
-# Node-OS: precise
-node 'jenkins.openstack.org' {
-  $group = "jenkins"
-  $zmq_event_receivers = ['logstash.openstack.org',
-                          'nodepool.openstack.org']
-  $zmq_iptables_rule = regsubst($zmq_event_receivers,
-                                '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 8888 -s \1 -j ACCEPT')
-  $http_iptables_rule = '-m state --state NEW -m tcp -p tcp --dport 80 -s nodepool.openstack.org -j ACCEPT'
-  $https_iptables_rule = '-m state --state NEW -m tcp -p tcp --dport 443 -s nodepool.openstack.org -j ACCEPT'
-  $iptables_rule = flatten([$zmq_iptables_rule, $http_iptables_rule, $https_iptables_rule])
-  class { 'openstack_project::server':
-    iptables_rules6     => $iptables_rule,
-    iptables_rules4     => $iptables_rule,
-    sysadmins           => hiera('sysadmins', []),
-    puppetmaster_server => 'puppetmaster.openstack.org',
-  }
-  class { 'openstack_project::jenkins':
-    project_config_repo     => 'https://git.openstack.org/openstack-infra/project-config',
-    jenkins_password        => hiera('jenkins_jobs_password'),
-    jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
-    ssl_cert_file           => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
-    ssl_key_file            => '/etc/ssl/private/ssl-cert-snakeoil.key',
-    ssl_chain_file          => '',
-  }
-}
-
 # Node-OS: precise
 node /^jenkins\d+\.openstack\.org$/ {
   $group = "jenkins"
@@ -840,7 +814,6 @@ node 'zuul.openstack.org' {
     statsd_host                    => 'graphite.openstack.org',
     gearman_workers                => [
       'nodepool.openstack.org',
-      'jenkins.openstack.org',
       'jenkins05.openstack.org',
       'jenkins06.openstack.org',
       'jenkins07.openstack.org',
@@ -942,7 +915,6 @@ node 'zuul-dev.openstack.org' {
     sysadmins            => hiera('sysadmins', []),
     statsd_host          => 'graphite.openstack.org',
     gearman_workers      => [
-      'jenkins.openstack.org',
       'jenkins05.openstack.org',
       'jenkins06.openstack.org',
       'jenkins07.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 15271b0a23..a99d57a7f3 100644
--- a/modules/openstack_project/files/logstash/jenkins-log-client.yaml
+++ b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
@@ -2,7 +2,6 @@ source-url: http://logs.openstack.org
 
 # List of zmq event inputs.
 zmq-publishers:
-  - tcp://jenkins.openstack.org:8888
   - tcp://jenkins05.openstack.org:8888
   - tcp://jenkins06.openstack.org:8888
   - tcp://jenkins07.openstack.org:8888