083281f7ee
Remove obsolete config options from zuul module. The server and merger classes are constructed so that they may coexist on a single server. Also, the init section is constructed so that it will install everything needed for both services but without activating them (leaving maximum flexibility for the operator). Change-Id: I7b86fbbe4611c5edfb463a0a6944e0717f664188
32 lines
792 B
Puppet
32 lines
792 B
Puppet
# == Class: openstack_project::zuul_merger
|
|
#
|
|
class openstack_project::zuul_merger(
|
|
$vhost_name = $::fqdn,
|
|
$gerrit_server = '',
|
|
$gerrit_user = '',
|
|
$zuul_ssh_private_key = '',
|
|
$zuul_url = "http://${::fqdn}/p",
|
|
$sysadmins = [],
|
|
) {
|
|
|
|
class { 'openstack_project::server':
|
|
iptables_public_tcp_ports => [80],
|
|
sysadmins => $sysadmins,
|
|
}
|
|
|
|
class { '::zuul':
|
|
vhost_name => $vhost_name,
|
|
gerrit_server => $gerrit_server,
|
|
gerrit_user => $gerrit_user,
|
|
zuul_ssh_private_key => $zuul_ssh_private_key,
|
|
zuul_url => $zuul_url,
|
|
}
|
|
|
|
class { '::zuul::merger': }
|
|
|
|
file { '/etc/zuul/merger-logging.conf':
|
|
ensure => present,
|
|
source => 'puppet:///modules/openstack_project/zuul/merger-logging.conf',
|
|
}
|
|
}
|