03560b7696
gearman-logging.conf, logging.conf and merger-logging.conf has been moved in puppet-zuul modules in: I76851c8672968a7581622cac8ff0062c1f50e0ef The patch this one depends on adds a feature flag (by default set to false) that can activate the installation of these configuration files. This patch removes the configuration files and set the feature flag to true in order to let puppet-zuul manage the configuration files by itself. Two follow up patches will then be created (once this one is merged) in order to set the feature flag (in puppet-zuul) at true by default and another one on system-config to remove "manage_log_conf => true". Change-Id: Ic5ceb7fb23a8403a31f9db2774ddd900fd838930 Depends-On: I76851c8672968a7581622cac8ff0062c1f50e0ef
53 lines
1.4 KiB
Puppet
53 lines
1.4 KiB
Puppet
# == Class: openstack_project::zuul_merger
|
|
#
|
|
class openstack_project::zuul_merger(
|
|
$vhost_name = $::fqdn,
|
|
$gearman_server = '127.0.0.1',
|
|
$gerrit_server = '',
|
|
$gerrit_user = '',
|
|
$gerrit_ssh_host_key = '',
|
|
$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,
|
|
gearman_server => $gearman_server,
|
|
gerrit_server => $gerrit_server,
|
|
gerrit_user => $gerrit_user,
|
|
zuul_ssh_private_key => $zuul_ssh_private_key,
|
|
zuul_url => $zuul_url,
|
|
git_email => 'jenkins@openstack.org',
|
|
git_name => 'OpenStack Jenkins',
|
|
}
|
|
|
|
class { '::zuul::merger':
|
|
manage_log_conf => true,
|
|
}
|
|
|
|
if $gerrit_ssh_host_key != '' {
|
|
file { '/home/zuul/.ssh':
|
|
ensure => directory,
|
|
owner => 'zuul',
|
|
group => 'zuul',
|
|
mode => '0700',
|
|
require => Class['::zuul'],
|
|
}
|
|
file { '/home/zuul/.ssh/known_hosts':
|
|
ensure => present,
|
|
owner => 'zuul',
|
|
group => 'zuul',
|
|
mode => '0600',
|
|
content => "review.openstack.org,23.253.232.87,2001:4800:7815:104:3bc3:d7f6:ff03:bf5d ${gerrit_ssh_host_key}",
|
|
replace => true,
|
|
require => File['/home/zuul/.ssh'],
|
|
}
|
|
}
|
|
}
|