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:
James E. Blair 2014-09-18 13:05:06 -07:00
parent 43b3bf275b
commit 289a749426
2 changed files with 14 additions and 5 deletions

View File

@ -146,11 +146,6 @@ class zuul (
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']
# at some point, but that still has some problems.
file { '/etc/zuul/zuul.conf':

View File

@ -16,6 +16,7 @@
# == Class: zuul::server
#
class zuul::server (
$layout_dir = '',
) {
service { 'zuul':
name => 'zuul',
@ -30,6 +31,19 @@ class zuul::server (
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
logrotate::file { 'zuul.log':
log => '/var/log/zuul/zuul.log',