From ab30c8d2493bf8b83597dd52686eba0bd8cc9ff8 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 7 Feb 2017 15:05:42 -0500 Subject: [PATCH] Break out openstack_project::server from zuul_prod.pp Change-Id: I1a38a283ed0fe06d51a57b3c43ca708978132255 Signed-off-by: Paul Belanger --- manifests/site.pp | 48 +++++++++++-------- .../openstack_project/manifests/zuul_prod.pp | 12 ----- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 42d3d58edc..63d8540030 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1011,6 +1011,34 @@ node /^nb\d+\.openstack\.org$/ { # Node-OS: trusty node 'zuul.openstack.org' { + $gearman_workers = [ + 'nodepool.openstack.org', + 'zlstatic01.openstack.org', + 'zl01.openstack.org', + 'zl02.openstack.org', + 'zl03.openstack.org', + 'zl04.openstack.org', + 'zl05.openstack.org', + 'zl06.openstack.org', + 'zl07.openstack.org', + 'zm01.openstack.org', + 'zm02.openstack.org', + 'zm03.openstack.org', + 'zm04.openstack.org', + 'zm05.openstack.org', + 'zm06.openstack.org', + 'zm07.openstack.org', + 'zm08.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, 443], + iptables_rules6 => $iptables_rules, + iptables_rules4 => $iptables_rules, + sysadmins => hiera('sysadmins', []), + } + class { 'openstack_project::zuul_prod': project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', gerrit_server => 'review.openstack.org', @@ -1022,27 +1050,7 @@ node 'zuul.openstack.org' { proxy_ssl_key_file_contents => hiera('zuul_ssl_key_file_contents'), proxy_ssl_chain_file_contents => hiera('zuul_ssl_chain_file_contents'), zuul_url => 'http://zuul.openstack.org/p', - sysadmins => hiera('sysadmins', []), statsd_host => 'graphite.openstack.org', - gearman_workers => [ - 'nodepool.openstack.org', - 'zlstatic01.openstack.org', - 'zl01.openstack.org', - 'zl02.openstack.org', - 'zl03.openstack.org', - 'zl04.openstack.org', - 'zl05.openstack.org', - 'zl06.openstack.org', - 'zl07.openstack.org', - 'zm01.openstack.org', - 'zm02.openstack.org', - 'zm03.openstack.org', - 'zm04.openstack.org', - 'zm05.openstack.org', - 'zm06.openstack.org', - 'zm07.openstack.org', - 'zm08.openstack.org', - ], } } diff --git a/modules/openstack_project/manifests/zuul_prod.pp b/modules/openstack_project/manifests/zuul_prod.pp index 7250aab0f4..f2d9fa3aac 100644 --- a/modules/openstack_project/manifests/zuul_prod.pp +++ b/modules/openstack_project/manifests/zuul_prod.pp @@ -22,23 +22,11 @@ class openstack_project::zuul_prod( $proxy_ssl_cert_file_contents = '', $proxy_ssl_key_file_contents = '', $proxy_ssl_chain_file_contents = '', - $sysadmins = [], $statsd_host = '', - $gearman_workers = [], $project_config_repo = '', $git_email = 'jenkins@openstack.org', $git_name = 'OpenStack Jenkins', ) { - # Turn a list of hostnames into a list of iptables rules - $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, 443], - iptables_rules6 => $iptables_rules, - iptables_rules4 => $iptables_rules, - sysadmins => $sysadmins, - } - class { 'openstackci::zuul_scheduler': vhost_name => $vhost_name, gearman_server => $gearman_server,