Collect build logs from nodepool-builders

Nodepool now has per image build logs, start collecting them. We can
also stop having a custom builder-logging.conf file.

Change-Id: I0e424bea068c88cd97009fcf45293d820ca6936a
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

playbooks/templates/nodepool/etc/nodepool/builder-logging.conf.j2

@@ -1,69 +0,0 @@
-# This file is generated by Ansible
-#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
-#
-{% set _diskimages = ['ubuntu-xenial'] -%}
-[loggers]
-keys=root,nodepool,requests,shade,
- {{ _diskimages|join(',') }}
-
-[handlers]
-keys=console,debug,normal,
- {{ _diskimages|join(',') }}
-
-[formatters]
-keys=simple
-
-[logger_root]
-level=WARNING
-handlers=console
-
-[logger_requests]
-level=WARNING
-handlers=debug,normal
-qualname=requests
-
-[logger_shade]
-level=DEBUG
-handlers=debug,normal
-qualname=shade
-
-[logger_nodepool]
-level=DEBUG
-handlers=debug,normal
-qualname=nodepool
-
-[handler_console]
-level=WARNING
-class=StreamHandler
-formatter=simple
-args=(sys.stdout,)
-
-[handler_debug]
-level=DEBUG
-class=logging.handlers.WatchedFileHandler
-formatter=simple
-args=('/var/log/nodepool/builder-debug.log',)
-
-[handler_normal]
-level=INFO
-class=logging.handlers.WatchedFileHandler
-formatter=simple
-args=('/var/log/nodepool/nodepool-builder.log',)
-
-{% for _diskimage in _diskimages -%}
-[logger_{{ _diskimage }}]
-level=DEBUG
-handlers={{ _diskimage }}
-qualname=nodepool.image.build.{{ _diskimage }}
-propagate=0
-
-[handler_{{ _diskimage }}]
-level=DEBUG
-class=logging.handlers.WatchedFileHandler
-formatter=simple
-args=('/var/log/nodepool/images/{{ _diskimage }}.log',)
-
-{% endfor -%}
-[formatter_simple]
-format=%(asctime)s %(levelname)s %(name)s: %(message)s
-datefmt=

playbooks/vars/nodepool.yaml

@@ -18,7 +18,6 @@
 # windmill.nodepool
 # NOTE(pabelanger): Because we are installing nodepool and nodepool-builder on a
 # shared host, we need to make sure both tasks use the same configuration.
-nodepool_file_builder_logging_conf_src: nodepool/etc/nodepool/builder-logging.conf.j2
 nodepool_file_nodepool_yaml_src: nodepool/etc/nodepool/nodepool.yaml.j2
 
 # windmill.ssh

tests/collect-logs.yaml

@@ -33,7 +33,7 @@
         - /etc/nodepool/builder-logging.conf
         - /etc/nodepool/nodepool.yaml
         - /var/log/nodepool/builder-debug.log
-        - /var/log/nodepool/images
+        - /var/log/nodepool/builds
         - /var/log/nodepool/nodepool-builder.log
 
 - hosts: nl01