opendev/system-config
Code Issues Proposed changes

Merge "Move server class call outside of jenkins*.pp class"

Browse Source
This commit is contained in:
Jenkins 2015-06-15 17:38:48 +00:00 committed by Gerrit Code Review
commit 84bfe7df63
3 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
manifests/site.pp
View File

@ -119,6 +119,17 @@ node 'review-dev.openstack.org' {
# Node-OS: precise # Node-OS: precise
node 'jenkins.openstack.org' { node 'jenkins.openstack.org' {
$group = "jenkins" $group = "jenkins"
$zmq_event_receivers = ['logstash.openstack.org',
'nodepool.openstack.org']
$iptables_rule = regsubst ($zmq_event_receivers,
'^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 8888 -s \1 -j ACCEPT')
class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443],
iptables_rules6 => $iptables_rule,
iptables_rules4 => $iptables_rule,
sysadmins => hiera('sysadmins', []),
puppetmaster_server => 'puppetmaster.openstack.org',
}
class { 'openstack_project::jenkins': class { 'openstack_project::jenkins':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
jenkins_jobs_password => hiera('jenkins_jobs_password', 'XXX'), jenkins_jobs_password => hiera('jenkins_jobs_password', 'XXX'),
@ -126,34 +137,41 @@ node 'jenkins.openstack.org' {
ssl_cert_file_contents => hiera('jenkins_ssl_cert_file_contents', 'XXX'), ssl_cert_file_contents => hiera('jenkins_ssl_cert_file_contents', 'XXX'),
ssl_key_file_contents => hiera('jenkins_ssl_key_file_contents', 'XXX'), ssl_key_file_contents => hiera('jenkins_ssl_key_file_contents', 'XXX'),
ssl_chain_file_contents => hiera('jenkins_ssl_chain_file_contents', 'XXX'), ssl_chain_file_contents => hiera('jenkins_ssl_chain_file_contents', 'XXX'),
sysadmins => hiera('sysadmins', []),
zmq_event_receivers => ['logstash.openstack.org',
'nodepool.openstack.org',
],
} }
} }
# Node-OS: precise # Node-OS: precise
node /^jenkins\d+\.openstack\.org$/ { node /^jenkins\d+\.openstack\.org$/ {
$group = "jenkins" $group = "jenkins"
$zmq_event_receivers = ['logstash.openstack.org',
'nodepool.openstack.org']
$iptables_rule = regsubst ($zmq_event_receivers,
'^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 8888 -s \1 -j ACCEPT')
class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443],
iptables_rules6 => $iptables_rule,
iptables_rules4 => $iptables_rule,
sysadmins => hiera('sysadmins', []),
puppetmaster_server => 'puppetmaster.openstack.org',
}
class { 'openstack_project::jenkins': class { 'openstack_project::jenkins':
jenkins_jobs_password => hiera('jenkins_jobs_password', 'XXX'), jenkins_jobs_password => hiera('jenkins_jobs_password', 'XXX'),
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents', 'XXX'), jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents', 'XXX'),
ssl_cert_file => '/etc/ssl/certs/ssl-cert-snakeoil.pem', ssl_cert_file => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
ssl_key_file => '/etc/ssl/private/ssl-cert-snakeoil.key', ssl_key_file => '/etc/ssl/private/ssl-cert-snakeoil.key',
ssl_chain_file => '', ssl_chain_file => '',
sysadmins => hiera('sysadmins', []),
zmq_event_receivers => ['logstash.openstack.org',
'nodepool.openstack.org',
],
} }
} }
# Node-OS: precise # Node-OS: precise
node 'jenkins-dev.openstack.org' { node 'jenkins-dev.openstack.org' {
class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443],
sysadmins => hiera('sysadmins', []),
puppetmaster_server => 'puppetmaster.openstack.org',
}
class { 'openstack_project::jenkins_dev': class { 'openstack_project::jenkins_dev':
jenkins_ssh_private_key => hiera('jenkins_dev_ssh_private_key_contents', 'XXX'), jenkins_ssh_private_key => hiera('jenkins_dev_ssh_private_key_contents', 'XXX'),
sysadmins => hiera('sysadmins', []),
mysql_password => hiera('nodepool_dev_mysql_password', 'XXX'), mysql_password => hiera('nodepool_dev_mysql_password', 'XXX'),
mysql_root_password => hiera('nodepool_dev_mysql_root_password', 'XXX'), mysql_root_password => hiera('nodepool_dev_mysql_root_password', 'XXX'),
nodepool_ssh_private_key => hiera('jenkins_dev_ssh_private_key_contents', 'XXX'), nodepool_ssh_private_key => hiera('jenkins_dev_ssh_private_key_contents', 'XXX'),

10
modules/openstack_project/manifests/jenkins.pp
View File

@ -15,22 +15,12 @@ class openstack_project::jenkins (
$ssl_chain_file_contents = '', $ssl_chain_file_contents = '',
$jenkins_ssh_public_key = $openstack_project::jenkins_ssh_key, $jenkins_ssh_public_key = $openstack_project::jenkins_ssh_key,
$jenkins_ssh_private_key = '', $jenkins_ssh_private_key = '',
$zmq_event_receivers = [],
$sysadmins = [],
$project_config_repo = '', $project_config_repo = '',
$serveradmin = 'webmaster@openstack.org', $serveradmin = 'webmaster@openstack.org',
$logo = 'openstack.png', $logo = 'openstack.png',
) inherits openstack_project { ) inherits openstack_project {
include openstack_project include openstack_project
$iptables_rule = regsubst ($zmq_event_receivers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 8888 -s \1 -j ACCEPT')
class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443],
iptables_rules6 => $iptables_rule,
iptables_rules4 => $iptables_rule,
sysadmins => $sysadmins,
}
# Set defaults here because they evaluate variables which you cannot # Set defaults here because they evaluate variables which you cannot
# do in the class parameter list. # do in the class parameter list.
if $ssl_cert_file == '' { if $ssl_cert_file == '' {

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

@ -2,7 +2,6 @@
# #
class openstack_project::jenkins_dev ( class openstack_project::jenkins_dev (
$jenkins_ssh_private_key = '', $jenkins_ssh_private_key = '',
$sysadmins = [],
$mysql_root_password, $mysql_root_password,
$mysql_password, $mysql_password,
$nodepool_ssh_private_key = '', $nodepool_ssh_private_key = '',
@ -21,10 +20,6 @@ class openstack_project::jenkins_dev (
include openstack_project include openstack_project
class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443],
sysadmins => $sysadmins,
}
include bup include bup
bup::site { 'rs-ord': bup::site { 'rs-ord':
backup_user => 'bup-jenkins-dev', backup_user => 'bup-jenkins-dev',