opendev/system-config
Code Issues Proposed changes

Merge "Let puppet-zuul manage log configuration files"

Browse Source
This commit is contained in:
Jenkins 2015-06-10 23:40:28 +00:00 committed by Gerrit Code Review
commit 78eb43c464
6 changed files with 12 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/openstack_project/files/zuul/gearman-logging.conf
View File

@ -1,33 +0,0 @@
[loggers]
keys=root,gear
[handlers]
keys=console,normal
[formatters]
keys=simple
[logger_root]
level=WARNING
handlers=console
[logger_gear]
level=DEBUG
handlers=normal
qualname=gear
[handler_console]
level=WARNING
class=StreamHandler
formatter=simple
args=(sys.stdout,)
[handler_normal]
level=WARNING
class=logging.handlers.WatchedFileHandler
formatter=simple
args=('/var/log/zuul/gearman-server.log',)
[formatter_simple]
format=%(asctime)s %(levelname)s %(name)s: %(message)s
datefmt=

49
modules/openstack_project/files/zuul/logging.conf
View File

@ -1,49 +0,0 @@
[loggers]
keys=root,zuul,gerrit,gear
[handlers]
keys=console,debug,normal
[formatters]
keys=simple
[logger_root]
level=WARNING
handlers=console
[logger_zuul]
level=DEBUG
handlers=debug,normal
qualname=zuul
[logger_gerrit]
level=DEBUG
handlers=debug,normal
qualname=gerrit
[logger_gear]
level=WARNING
handlers=debug,normal
qualname=gear
[handler_console]
level=WARNING
class=StreamHandler
formatter=simple
args=(sys.stdout,)
[handler_debug]
level=DEBUG
class=logging.handlers.WatchedFileHandler
formatter=simple
args=('/var/log/zuul/debug.log',)
[handler_normal]
level=INFO
class=logging.handlers.WatchedFileHandler
formatter=simple
args=('/var/log/zuul/zuul.log',)
[formatter_simple]
format=%(asctime)s %(levelname)s %(name)s: %(message)s
datefmt=

49
modules/openstack_project/files/zuul/merger-logging.conf
View File

@ -1,49 +0,0 @@
[loggers]
keys=root,zuul,gerrit,gear
[handlers]
keys=console,debug,normal
[formatters]
keys=simple
[logger_root]
level=WARNING
handlers=console
[logger_zuul]
level=DEBUG
handlers=debug,normal
qualname=zuul
[logger_gerrit]
level=INFO
handlers=debug,normal
qualname=gerrit
[logger_gear]
level=WARNING
handlers=debug,normal
qualname=gear
[handler_console]
level=WARNING
class=StreamHandler
formatter=simple
args=(sys.stdout,)
[handler_debug]
level=DEBUG
class=logging.handlers.WatchedFileHandler
formatter=simple
args=('/var/log/zuul/merger-debug.log',)
[handler_normal]
level=INFO
class=logging.handlers.WatchedFileHandler
formatter=simple
args=('/var/log/zuul/merger.log',)
[formatter_simple]
format=%(asctime)s %(levelname)s %(name)s: %(message)s
datefmt=

26
modules/openstack_project/manifests/zuul_dev.pp
View File

@ -51,11 +51,14 @@ class openstack_project::zuul_dev(
}
class { '::zuul::server':
layout_dir => $::project_config::zuul_layout_dir,
require => $::project_config::config_dir,
layout_dir => $::project_config::zuul_layout_dir,
manage_log_conf => true,
require => $::project_config::config_dir,
}
class { '::zuul::merger': }
class { '::zuul::merger':
manage_log_conf => true,
}
if $gerrit_ssh_host_key != '' {
file { '/home/zuul/.ssh':
@ -75,21 +78,4 @@ class openstack_project::zuul_dev(
require => File['/home/zuul/.ssh'],
}
}
file { '/etc/zuul/logging.conf':
ensure => present,
source => 'puppet:///modules/openstack_project/zuul/logging.conf',
notify => Exec['zuul-reload'],
}
file { '/etc/zuul/gearman-logging.conf':
ensure => present,
source => 'puppet:///modules/openstack_project/zuul/gearman-logging.conf',
notify => Exec['zuul-reload'],
}
file { '/etc/zuul/merger-logging.conf':
ensure => present,
source => 'puppet:///modules/openstack_project/zuul/merger-logging.conf',
}
}

9
modules/openstack_project/manifests/zuul_merger.pp
View File

@ -27,7 +27,9 @@ class openstack_project::zuul_merger(
git_name => 'OpenStack Jenkins',
}
class { '::zuul::merger': }
class { '::zuul::merger':
manage_log_conf => true,
}
if $gerrit_ssh_host_key != '' {
file { '/home/zuul/.ssh':
@ -47,9 +49,4 @@ class openstack_project::zuul_merger(
require => File['/home/zuul/.ssh'],
}
}
file { '/etc/zuul/merger-logging.conf':
ensure => present,
source => 'puppet:///modules/openstack_project/zuul/merger-logging.conf',
}
}

22
modules/openstack_project/manifests/zuul_prod.pp
View File

@ -69,8 +69,9 @@ class openstack_project::zuul_prod(
}
class { '::zuul::server':
layout_dir => $::project_config::zuul_layout_dir,
require => $::project_config::config_dir,
layout_dir => $::project_config::zuul_layout_dir,
manage_log_conf => true,
require => $::project_config::config_dir,
}
if $gerrit_ssh_host_key != '' {
@ -91,21 +92,4 @@ class openstack_project::zuul_prod(
require => File['/home/zuul/.ssh'],
}
}
file { '/etc/zuul/logging.conf':
ensure => present,
source => 'puppet:///modules/openstack_project/zuul/logging.conf',
notify => Exec['zuul-reload'],
}
file { '/etc/zuul/gearman-logging.conf':
ensure => present,
source => 'puppet:///modules/openstack_project/zuul/gearman-logging.conf',
notify => Exec['zuul-reload'],
}
file { '/etc/zuul/merger-logging.conf':
ensure => present,
source => 'puppet:///modules/openstack_project/zuul/merger-logging.conf',
}
}