From 79523f02049273cf27bd7a6f4cf3d7c32f8ae086 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 7 Feb 2017 14:22:32 -0500 Subject: [PATCH] Break out openstack_project::server from zuul_merger.pp This should be setup in site.pp, like all our other nodes. Change-Id: I790f59d870ac70340bc43b9ebf53f6ce93fd5f46 Signed-off-by: Paul Belanger --- manifests/site.pp | 6 +++++- modules/openstack_project/manifests/zuul_merger.pp | 7 ------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index ef16c1919c..3e51412ab6 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1106,13 +1106,17 @@ node /^zl\d+\.openstack\.org$/ { # Node-OS: trusty node /^zm\d+\.openstack\.org$/ { $group = "zuul-merger" + class { 'openstack_project::server': + iptables_public_tcp_ports => [80], + sysadmins => hiera('sysadmins', []), + } + class { 'openstack_project::zuul_merger': gearman_server => 'zuul.openstack.org', gerrit_server => 'review.openstack.org', gerrit_user => 'jenkins', gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'), zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'), - sysadmins => hiera('sysadmins', []), } } diff --git a/modules/openstack_project/manifests/zuul_merger.pp b/modules/openstack_project/manifests/zuul_merger.pp index 3d1698a7e3..cd6fdb7d74 100644 --- a/modules/openstack_project/manifests/zuul_merger.pp +++ b/modules/openstack_project/manifests/zuul_merger.pp @@ -8,16 +8,9 @@ class openstack_project::zuul_merger( $gerrit_ssh_host_key = '', $zuul_ssh_private_key = '', $zuul_url = "http://${::fqdn}/p", - $sysadmins = [], $git_email = 'jenkins@openstack.org', $git_name = 'OpenStack Jenkins', ) { - - class { 'openstack_project::server': - iptables_public_tcp_ports => [80], - sysadmins => $sysadmins, - } - class { 'openstackci::zuul_merger': vhost_name => $vhost_name, gearman_server => $gearman_server,