opendev/system-config
Code Issues Proposed changes

Decomission jenkins-dev.openstack.org

Browse Source 
Change-Id: I9c2c3d96b6442241ef5fe6fb5afc3fdf18834a76
This commit is contained in:
James E. Blair 2016-06-15 13:20:11 -07:00
parent 5ea1a43d56
commit 5690f9971b
4 changed files with 1 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hiera/common.yaml
View File

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

28
manifests/site.pp
View File

@ -161,32 +161,6 @@ node /^jenkins\d+\.openstack\.org$/ {
}
}
# Node-OS: precise
node 'jenkins-dev.openstack.org' {
$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([$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_dev':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
jenkins_ssh_private_key => hiera('jenkins_dev_ssh_private_key_contents'),
mysql_password => hiera('nodepool_dev_mysql_password'),
mysql_root_password => hiera('nodepool_dev_mysql_root_password'),
nodepool_ssh_private_key => hiera('jenkins_dev_ssh_private_key_contents'),
jenkins_api_user => hiera('jenkins_dev_api_user', 'username'),
jenkins_api_key => hiera('jenkins_dev_api_key'),
jenkins_credentials_id => hiera('jenkins_dev_credentials_id'),
hpcloud_username => hiera('nodepool_hpcloud_username', 'username'),
hpcloud_password => hiera('nodepool_hpcloud_password'),
hpcloud_project => hiera('nodepool_hpcloud_project'),
}
}
# Node-OS: trusty
node 'cacti.openstack.org' {
include openstack_project::ssl_cert_check
@ -817,7 +791,6 @@ node 'zuul.openstack.org' {
'jenkins05.openstack.org',
'jenkins06.openstack.org',
'jenkins07.openstack.org',
'jenkins-dev.openstack.org',
'zlstatic01.openstack.org',
'zl01.openstack.org',
'zl02.openstack.org',
@ -918,7 +891,6 @@ node 'zuul-dev.openstack.org' {
'jenkins05.openstack.org',
'jenkins06.openstack.org',
'jenkins07.openstack.org',
'jenkins-dev.openstack.org',
],
}
}

2
modules/openstack_project/files/puppetmaster/groups.txt
View File

@ -10,4 +10,4 @@ afsdb afsdb*.openstack.org
afs afs*.*.openstack.org
wheel-mirror *wheel-mirror-*.openstack.org
afsadmin mirror-update.openstack.org:release.slave.openstack.org
disabled ci-backup-rs-ord.openstack.org:jenkins-dev.openstack.org:ask-staging.openstack.org:db368fcd-e61a-4294-a5cb-851c16650f7a
disabled ci-backup-rs-ord.openstack.org:ask-staging.openstack.org:db368fcd-e61a-4294-a5cb-851c16650f7a

141
modules/openstack_project/manifests/jenkins_dev.pp
View File

@ -1,141 +0,0 @@
# == Class: openstack_project::jenkins_dev
#
class openstack_project::jenkins_dev (
$project_config_repo = '',
$jenkins_ssh_private_key = '',
$mysql_root_password,
$mysql_password,
$nodepool_ssh_private_key = '',
$jenkins_api_user ='',
$jenkins_api_key ='',
$jenkins_credentials_id ='',
$hpcloud_username ='',
$hpcloud_password ='',
$hpcloud_project ='',
$nodepool_template ='nodepool-dev.yaml.erb',
) {
realize (
User::Virtual::Localuser['zaro'],
)
include openstack_project
include bup
bup::site { 'rs-ord':
backup_user => 'bup-jenkins-dev',
backup_server => 'ci-backup-rs-ord.openstack.org',
}
class { '::jenkins::master':
vhost_name => 'jenkins-dev.openstack.org',
serveradmin => 'webmaster@openstack.org',
logo => 'openstack.png',
ssl_cert_file => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
ssl_key_file => '/etc/ssl/private/ssl-cert-snakeoil.key',
ssl_chain_file => '',
jenkins_ssh_private_key => $jenkins_ssh_private_key,
jenkins_ssh_public_key => $openstack_project::jenkins_dev_ssh_key,
}
jenkins::plugin { 'build-timeout':
version => '1.14',
}
jenkins::plugin { 'copyartifact':
version => '1.22',
}
jenkins::plugin { 'dashboard-view':
version => '2.3',
}
jenkins::plugin { 'gearman-plugin':
version => '0.1.3',
}
jenkins::plugin { 'git':
version => '1.1.23',
}
jenkins::plugin { 'greenballs':
version => '1.12',
}
jenkins::plugin { 'extended-read-permission':
version => '1.0',
}
jenkins::plugin { 'zmq-event-publisher':
version => '0.0.3',
}
# TODO(jeblair): release
# jenkins::plugin { 'scp':
# version => '1.9',
# }
jenkins::plugin { 'jobConfigHistory':
version => '1.13',
}
jenkins::plugin { 'monitoring':
version => '1.40.0',
}
jenkins::plugin { 'nodelabelparameter':
version => '1.2.1',
}
jenkins::plugin { 'notification':
version => '1.4',
}
jenkins::plugin { 'openid':
version => '1.5',
}
jenkins::plugin { 'postbuildscript':
version => '0.16',
}
jenkins::plugin { 'publish-over-ftp':
version => '1.7',
}
jenkins::plugin { 'simple-theme-plugin':
version => '0.2',
}
jenkins::plugin { 'timestamper':
version => '1.3.1',
}
jenkins::plugin { 'token-macro':
version => '1.5.1',
}
class { '::nodepool':
mysql_root_password => $mysql_root_password,
mysql_password => $mysql_password,
nodepool_ssh_private_key => $nodepool_ssh_private_key,
environment => {
'NODEPOOL_SSH_KEY' => $openstack_project::jenkins_dev_ssh_key,
}
}
file { '/etc/nodepool/nodepool.yaml':
ensure => present,
owner => 'nodepool',
group => 'root',
mode => '0400',
content => template("openstack_project/nodepool/${nodepool_template}"),
require => [
File['/etc/nodepool'],
User['nodepool'],
],
}
file { '/etc/nodepool/scripts':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755',
recurse => true,
purge => true,
force => true,
require => [
File['/etc/nodepool'],
Class['project_config'],
],
source => $::project_config::nodepool_scripts_dir,
}
if ! defined(Class['project_config']) {
class { 'project_config':
url => $project_config_repo,
}
}
}