Fix zuul installation
The following items were missing from an automated zuul install: * A pre-populated known hosts file * The git user/email for creating commits (.gitconfig existed on zuul.o.o, but switch to using zuul's config file instead). Also, make sure that the mergers specify the zuul server as the gearman server address rather than localhost. Change-Id: I47a473f60c4b5b2daaa910aa61cdf6e0c6fe1528
This commit is contained in:
committed by
Jeremy Stanley
parent
794b1d4e89
commit
17e09934db
@@ -2,8 +2,10 @@
|
||||
#
|
||||
class openstack_project::zuul_prod(
|
||||
$vhost_name = $::fqdn,
|
||||
$gearman_server = '127.0.0.1',
|
||||
$gerrit_server = '',
|
||||
$gerrit_user = '',
|
||||
$gerrit_ssh_host_key = '',
|
||||
$zuul_ssh_private_key = '',
|
||||
$url_pattern = '',
|
||||
$zuul_url = '',
|
||||
@@ -23,6 +25,7 @@ class openstack_project::zuul_prod(
|
||||
|
||||
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,
|
||||
@@ -31,10 +34,31 @@ class openstack_project::zuul_prod(
|
||||
job_name_in_report => true,
|
||||
status_url => 'http://status.openstack.org/zuul/',
|
||||
statsd_host => $statsd_host,
|
||||
git_email => 'jenkins@openstack.org',
|
||||
git_name => 'OpenStack Jenkins',
|
||||
}
|
||||
|
||||
class { '::zuul::server': }
|
||||
|
||||
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 ${gerrit_ssh_host_key}",
|
||||
replace => true,
|
||||
require => File['/home/zuul/.ssh'],
|
||||
}
|
||||
}
|
||||
|
||||
file { '/etc/zuul/layout.yaml':
|
||||
ensure => present,
|
||||
source => 'puppet:///modules/openstack_project/zuul/layout.yaml',
|
||||
|
||||
Reference in New Issue
Block a user