diff --git a/hiera/common.yaml b/hiera/common.yaml index d9047e46ad..7220c77cf2 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -493,6 +493,7 @@ cacti_hosts: - translate.openstack.org - translate-dev.openstack.org - wiki.openstack.org +- ze01.openstack.org - zlstatic01.openstack.org - zl01.openstack.org - zl02.openstack.org diff --git a/manifests/site.pp b/manifests/site.pp index fc0616ac19..52d2fd69e2 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1107,6 +1107,7 @@ node /^ze\d+\.openstack\.org$/ { # NOTE(pabelanger): We call ::zuul directly, so we can override all in one # settings. class { '::zuul': + gearman_server => 'zuulv3.openstack.org', gerrit_server => $gerrit_server, gerrit_user => $gerrit_user, zuul_ssh_private_key => $zuul_ssh_private_key, @@ -1177,8 +1178,15 @@ node 'zuulv3.openstack.org' { $git_name = 'OpenStack Zuul' $revision = 'feature/zuulv3' + $gearman_workers = [ + 'ze01.openstack.org', + ] + $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', []), }