opendev/system-config
Code Issues Proposed changes

Decomission jenkins.openstack.org

Browse Source 
Change-Id: Ibb6115ca391b76f9be26660c073447931dc283b0
This commit is contained in:
James E. Blair 2016-06-15 13:17:57 -07:00
parent 4e0a9ab7f8
commit 5ea1a43d56
3 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hiera/common.yaml
View File

@ -293,7 +293,6 @@ cacti_hosts:
- groups.openstack.org - groups.openstack.org
- health.openstack.org - health.openstack.org
- jenkins-dev.openstack.org - jenkins-dev.openstack.org
- jenkins.openstack.org
- jenkins05.openstack.org - jenkins05.openstack.org
- jenkins06.openstack.org - jenkins06.openstack.org
- jenkins07.openstack.org - jenkins07.openstack.org

28
manifests/site.pp
View File

@ -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-OS: precise
node /^jenkins\d+\.openstack\.org$/ { node /^jenkins\d+\.openstack\.org$/ {
$group = "jenkins" $group = "jenkins"
@ -840,7 +814,6 @@ node 'zuul.openstack.org' {
statsd_host => 'graphite.openstack.org', statsd_host => 'graphite.openstack.org',
gearman_workers => [ gearman_workers => [
'nodepool.openstack.org', 'nodepool.openstack.org',
'jenkins.openstack.org',
'jenkins05.openstack.org', 'jenkins05.openstack.org',
'jenkins06.openstack.org', 'jenkins06.openstack.org',
'jenkins07.openstack.org', 'jenkins07.openstack.org',
@ -942,7 +915,6 @@ node 'zuul-dev.openstack.org' {
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
statsd_host => 'graphite.openstack.org', statsd_host => 'graphite.openstack.org',
gearman_workers => [ gearman_workers => [
'jenkins.openstack.org',
'jenkins05.openstack.org', 'jenkins05.openstack.org',
'jenkins06.openstack.org', 'jenkins06.openstack.org',
'jenkins07.openstack.org', 'jenkins07.openstack.org',

1
modules/openstack_project/files/logstash/jenkins-log-client.yaml
View File

@ -2,7 +2,6 @@ source-url: http://logs.openstack.org
# List of zmq event inputs. # List of zmq event inputs.
zmq-publishers: zmq-publishers:
- tcp://jenkins.openstack.org:8888
- tcp://jenkins05.openstack.org:8888 - tcp://jenkins05.openstack.org:8888
- tcp://jenkins06.openstack.org:8888 - tcp://jenkins06.openstack.org:8888
- tcp://jenkins07.openstack.org:8888 - tcp://jenkins07.openstack.org:8888