opendev/system-config
Code Issues Proposed changes

Use nodepool-builder.logging.conf from puppet-nodepool

Browse Source 
Generating a openstack-infra specific version of this file was
deprecated with change I6fdc3b622454b069f3ad2cf42da584d8df23a110 when
build logs was moved out of Python logging.

This means (post the depends-on) the file is exactly as kept in
puppet-nodepool.  Remove the system-config template and just use that.

Depends-On: https://review.openstack.org/586231
Change-Id: I2db37868be12c146678f1c8934db80050c788540
This commit is contained in:
David Shrewsbury 2018-07-26 10:11:17 -04:00 committed by Ian Wienand
parent b137611123
commit 10e4c57128
2 changed files with 0 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -1041,7 +1041,6 @@ node 'nodepool.openstack.org' {
image_log_document_root => '/var/log/nodepool/image', image_log_document_root => '/var/log/nodepool/image',
statsd_host => 'graphite.openstack.org', statsd_host => 'graphite.openstack.org',
logging_conf_template => 'openstack_project/nodepool/nodepool.logging.conf.erb', logging_conf_template => 'openstack_project/nodepool/nodepool.logging.conf.erb',
builder_logging_conf_template => 'openstack_project/nodepool/nodepool-builder.logging.conf.erb',
upload_workers => '16', upload_workers => '16',
jenkins_masters => [], jenkins_masters => [],
split_daemon => true, split_daemon => true,
@ -1178,7 +1177,6 @@ node /^nb\d+\.openstack\.org$/ {
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
oscc_file_contents => $clouds_yaml, oscc_file_contents => $clouds_yaml,
statsd_host => 'graphite.openstack.org', statsd_host => 'graphite.openstack.org',
builder_logging_conf_template => 'openstack_project/nodepool/nodepool-builder.logging.conf.erb',
upload_workers => '16', upload_workers => '16',
revision => 'master', revision => 'master',
python_version => 3, python_version => 3,

60
modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
View File

@ -1,60 +0,0 @@
[loggers]
keys=root,nodepool,requests,shade,openstack,kazoo
[handlers]
keys=console,debug,normal
[formatters]
keys=simple
[logger_root]
level=WARNING
handlers=console
[logger_requests]
level=WARNING
handlers=debug,normal
qualname=requests
[logger_shade]
level=WARNING
handlers=debug,normal
qualname=shade
[logger_openstack]
level=WARNING
handlers=debug,normal
qualname=openstack
[logger_nodepool]
level=DEBUG
handlers=debug,normal
qualname=nodepool
[logger_kazoo]
level=INFO
handlers=debug,normal
qualname=kazoo
propagate=0
[handler_console]
level=WARNING
class=StreamHandler
formatter=simple
args=(sys.stdout,)
[handler_debug]
level=DEBUG
class=logging.handlers.TimedRotatingFileHandler
formatter=simple
args=('/var/log/nodepool/builder-debug.log', 'H', 8, 30,)
[handler_normal]
level=INFO
class=logging.handlers.TimedRotatingFileHandler
formatter=simple
args=('/var/log/nodepool/nodepool-builder.log', 'H', 8, 30,)
[formatter_simple]
format=%(asctime)s %(levelname)s %(name)s: %(message)s
datefmt=