From c3324f1d62b514241822215b635237323d06eb4b Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 7 Feb 2017 14:32:26 -0500 Subject: [PATCH] Add zuulv3-dev.openstack.org server This is needed for our zuulv3 effort durning the atlanta PTG event. We don't expect this server to be moved into production at this time. Currently, we are missing zuul-launcher and zuul-scheduler support, which will be added in a follow up patch. Change-Id: I97a3ffd168679562edd2f89c572c185d94b44255 Signed-off-by: Paul Belanger --- manifests/site.pp | 43 +++++++++++++++++++ .../manifests/zuul_merger.pp | 5 ++- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/manifests/site.pp b/manifests/site.pp index 8f449b879e..cd044b2058 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1089,6 +1089,49 @@ node /^nb\d+\.openstack\.org$/ { } } +node 'zuulv3-dev.openstack.org' { + $gerrit_server => 'review.openstack.org', + $gerrit_user => 'zuul', + $gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'), + $zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'), + $zuul_url = "http://${::fqdn}/p", + $git_email = 'zuul@openstack.org', + $git_name = 'OpenStack Zuul', + $revision = 'feature/zuulv3', + + $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', []), + } + + # NOTE(pabelanger): We call ::zuul directly, so we can override all in one + # settings. + class { '::zuul': + gerrit_server => $gerrit_server, + gerrit_user => $gerrit_user, + zuul_ssh_private_key => $zuul_ssh_private_key, + git_email => $git_email, + git_name => $git_name, + revision => $revision, + } + + class { 'openstack_project::zuul_merger': + gerrit_server => $gerrit_server + gerrit_user => $gerrit_user, + gerrit_ssh_host_key => $gerrit_ssh_host_key, + zuul_ssh_private_key => $zuul_ssh_private_key, + revision => $revision, + manage_common_zuul => false, + } + # TODO(pabelanger): Add zuul_scheduler support + # TODO(pabelanger): Add zuul_launcher support +} + # Node-OS: trusty node 'zuul.openstack.org' { $gearman_workers = [ diff --git a/modules/openstack_project/manifests/zuul_merger.pp b/modules/openstack_project/manifests/zuul_merger.pp index cd6fdb7d74..ec8333dc90 100644 --- a/modules/openstack_project/manifests/zuul_merger.pp +++ b/modules/openstack_project/manifests/zuul_merger.pp @@ -10,6 +10,8 @@ class openstack_project::zuul_merger( $zuul_url = "http://${::fqdn}/p", $git_email = 'jenkins@openstack.org', $git_name = 'OpenStack Jenkins', + $revision = 'master', + $manage_common_zuul = true, ) { class { 'openstackci::zuul_merger': vhost_name => $vhost_name, @@ -21,6 +23,7 @@ class openstack_project::zuul_merger( zuul_url => $zuul_url, git_email => $git_email, git_name => $git_name, - manage_common_zuul => true, + manage_common_zuul => $manage_common_zuul, + revision => $revision, } }