From eeca2ebb5006fd78b5529c16b90c175088e61ec8 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 16 Feb 2017 15:33:32 -0500 Subject: [PATCH] Add Node-OS: trusty for zuulv3-dev.o.o Surprisingly our previous patch wasn't actually tested in the gate. Enable that logic and fix syntax issues. Change-Id: I5dd98ab0b75fd5f31ed80b8fe0bcc0bd11e4352d Signed-off-by: Paul Belanger --- manifests/site.pp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index cd044b2058..3a82642e69 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1089,15 +1089,16 @@ node /^nb\d+\.openstack\.org$/ { } } +# Node-OS: trusty 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', + $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') @@ -1121,7 +1122,7 @@ node 'zuulv3-dev.openstack.org' { } class { 'openstack_project::zuul_merger': - gerrit_server => $gerrit_server + gerrit_server => $gerrit_server, gerrit_user => $gerrit_user, gerrit_ssh_host_key => $gerrit_ssh_host_key, zuul_ssh_private_key => $zuul_ssh_private_key,