Switch zuul and zuul-dev to project-config
Start using the project-config repo for Zuul. Stop managing /etc/zuul/layout in the zuul module itself in favor of the project_config module. Change-Id: I46ddb22c53783c0cffa665959f708b0568abd25f
This commit is contained in:
parent
43b3bf275b
commit
289a749426
@ -146,11 +146,6 @@ class zuul (
|
|||||||
ensure => directory,
|
ensure => directory,
|
||||||
}
|
}
|
||||||
|
|
||||||
file { '/etc/zuul/layout':
|
|
||||||
ensure => directory,
|
|
||||||
require => File['/etc/zuul'],
|
|
||||||
}
|
|
||||||
|
|
||||||
# TODO: We should put in notify either Service['zuul'] or Exec['zuul-reload']
|
# TODO: We should put in notify either Service['zuul'] or Exec['zuul-reload']
|
||||||
# at some point, but that still has some problems.
|
# at some point, but that still has some problems.
|
||||||
file { '/etc/zuul/zuul.conf':
|
file { '/etc/zuul/zuul.conf':
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
# == Class: zuul::server
|
# == Class: zuul::server
|
||||||
#
|
#
|
||||||
class zuul::server (
|
class zuul::server (
|
||||||
|
$layout_dir = '',
|
||||||
) {
|
) {
|
||||||
service { 'zuul':
|
service { 'zuul':
|
||||||
name => 'zuul',
|
name => 'zuul',
|
||||||
@ -30,6 +31,19 @@ class zuul::server (
|
|||||||
refreshonly => true,
|
refreshonly => true,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
file { '/etc/zuul/layout':
|
||||||
|
ensure => directory,
|
||||||
|
owner => 'root',
|
||||||
|
group => 'root',
|
||||||
|
mode => '0755',
|
||||||
|
recurse => true,
|
||||||
|
purge => true,
|
||||||
|
force => true,
|
||||||
|
source => $layout_dir,
|
||||||
|
require => File['/etc/zuul'],
|
||||||
|
notify => Exec['zuul-reload'],
|
||||||
|
}
|
||||||
|
|
||||||
include logrotate
|
include logrotate
|
||||||
logrotate::file { 'zuul.log':
|
logrotate::file { 'zuul.log':
|
||||||
log => '/var/log/zuul/zuul.log',
|
log => '/var/log/zuul/zuul.log',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user