diff --git a/hiera/common.yaml b/hiera/common.yaml index 1515d4eb40..9c116ec68a 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 198baa3c22..37b168de36 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', @@ -971,7 +963,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 b9abed6ba7..b2e46f7584 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