opendev
/
system-config
Code Issues Proposed changes

Merge "Remove zuul-dev.o.o"

This commit is contained in:
Zuul 2018-01-16 19:00:26 +00:00 committed by Gerrit Code Review
parent abe372e58b 95eb5e108c
commit cf62dfd4fa
3 changed files with 0 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/source/zuul.rst
View File

@ -14,7 +14,6 @@ At a Glance
:Hosts:
* http://status.openstack.org/zuul
* http://zuul.openstack.org
* http://zuul-dev.openstack.org
* zm*.openstack.org
:Puppet:
* https://git.openstack.org/cgit/openstack-infra/puppet-zuul/tree/

24
manifests/site.pp
View File

@ -1544,30 +1544,6 @@ node /^zm\d+.openstack\.org$/ {
}
}
# Node-OS: trusty
node 'zuul-dev.openstack.org' {
$gearman_workers = []
$iptables_rules = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT')
class { 'openstack_project::server':
iptables_public_tcp_ports => [80],
iptables_rules6 => $iptables_rules,
iptables_rules4 => $iptables_rules,
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::zuul_dev':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
gerrit_server => 'review-dev.openstack.org',
gerrit_user => 'jenkins',
gerrit_ssh_host_key => hiera('gerrit_dev_ssh_rsa_pubkey_contents'),
zuul_ssh_private_key => hiera('zuul_dev_ssh_private_key_contents'),
url_pattern => 'http://logs.openstack.org/{build.parameters[LOG_PATH]}',
zuul_url => 'http://zuul-dev.openstack.org/p',
statsd_host => 'graphite.openstack.org',
}
}
# Node-OS: trusty
node 'pbx.openstack.org' {
class { 'openstack_project::server':

42
modules/openstack_project/manifests/zuul_dev.pp
View File

@ -1,42 +0,0 @@
# == Class: openstack_project::zuul_dev
#
class openstack_project::zuul_dev(
$vhost_name = $::fqdn,
$gearman_server = '127.0.0.1',
$gerrit_server = '',
$gerrit_user = '',
$gerrit_ssh_host_key = '',
$zuul_ssh_private_key = '',
$url_pattern = '',
$status_url = 'http://zuul-dev.openstack.org',
$zuul_url = '',
$statsd_host = '',
$project_config_repo = '',
) {
realize (
User::Virtual::Localuser['zaro'],
)
class { 'openstackci::zuul_scheduler':
vhost_name => $vhost_name,
gearman_server => $gearman_server,
gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user,
known_hosts_content => "review-dev.openstack.org,23.253.78.13,2001:4800:7817:101:be76:4eff:fe04 ${gerrit_ssh_host_key}",
zuul_ssh_private_key => $zuul_ssh_private_key,
url_pattern => $url_pattern,
zuul_url => $zuul_url,
job_name_in_report => true,
status_url => $status_url,
statsd_host => $statsd_host,
git_email => 'jenkins@openstack.org',
git_name => 'OpenStack Jenkins',
project_config_repo => $project_config_repo,
project_config_base => 'dev/',
}
class { 'openstackci::zuul_merger':
manage_common_zuul => false,
}
}