diff --git a/manifests/site.pp b/manifests/site.pp index 8a3d088784..c0518ebcac 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1041,7 +1041,6 @@ node 'nodepool.openstack.org' { image_log_document_root => '/var/log/nodepool/image', statsd_host => 'graphite.openstack.org', 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', jenkins_masters => [], split_daemon => true, @@ -1178,7 +1177,6 @@ node /^nb\d+\.openstack\.org$/ { project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', oscc_file_contents => $clouds_yaml, statsd_host => 'graphite.openstack.org', - builder_logging_conf_template => 'openstack_project/nodepool/nodepool-builder.logging.conf.erb', upload_workers => '16', revision => 'master', python_version => 3, diff --git a/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb b/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb deleted file mode 100644 index 9f1503c3d6..0000000000 --- a/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb +++ /dev/null @@ -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=