Merge "Decomission jenkins05 - jenkins07"

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

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      => [],
   }
 }
 

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