opendev/system-config
Code Issues Proposed changes

Merge "Add Node-OS: trusty for zuulv3-dev.o.o"

Browse Source
This commit is contained in:
Jenkins 2017-02-16 21:12:47 +00:00 committed by Gerrit Code Review
commit 9cf7c2bbcf
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/site.pp
View File

@ -1093,15 +1093,16 @@ node /^nb\d+\.openstack\.org$/ {
} }
} }
# Node-OS: trusty
node 'zuulv3-dev.openstack.org' { node 'zuulv3-dev.openstack.org' {
$gerrit_server => 'review.openstack.org', $gerrit_server = 'review.openstack.org'
$gerrit_user => 'zuul', $gerrit_user = 'zuul'
$gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'), $gerrit_ssh_host_key = hiera('gerrit_ssh_rsa_pubkey_contents')
$zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'), $zuul_ssh_private_key = hiera('zuul_ssh_private_key_contents')
$zuul_url = "http://${::fqdn}/p", $zuul_url = "http://${::fqdn}/p"
$git_email = 'zuul@openstack.org', $git_email = 'zuul@openstack.org'
$git_name = 'OpenStack Zuul', $git_name = 'OpenStack Zuul'
$revision = 'feature/zuulv3', $revision = 'feature/zuulv3'
$gearman_workers = [] $gearman_workers = []
$iptables_rules = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT') $iptables_rules = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT')
@ -1125,7 +1126,7 @@ node 'zuulv3-dev.openstack.org' {
} }
class { 'openstack_project::zuul_merger': class { 'openstack_project::zuul_merger':
gerrit_server => $gerrit_server gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user, gerrit_user => $gerrit_user,
gerrit_ssh_host_key => $gerrit_ssh_host_key, gerrit_ssh_host_key => $gerrit_ssh_host_key,
zuul_ssh_private_key => $zuul_ssh_private_key, zuul_ssh_private_key => $zuul_ssh_private_key,