diff --git a/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb b/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
index 45bc57fb8d..9bb9ae2b02 100644
--- a/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
@@ -6,10 +6,10 @@
 #
 
 [loggers]
-keys=root,nodepool,requests,shade,image,rax-dfw_devstack-precise,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_bare-centos6,rax-dfw_centos-6,rax-dfw_devstack-f21,rax-dfw_devstack-centos7,rax-ord_devstack-precise,rax-ord_bare-precise,rax-ord_devstack-trusty,rax-ord_bare-trusty,rax-ord_bare-centos6,rax-ord_centos-6,rax-ord_devstack-f21,rax-ord_devstack-centos7,rax-iad_devstack-precise,rax-iad_bare-precise,rax-iad_devstack-trusty,rax-iad_bare-trusty,rax-iad_bare-centos6,rax-iad_centos-6,rax-iad_devstack-precise-check,rax-iad_devstack-f21,rax-iad_devstack-centos7,hpcloud-region-a_devstack-precise-check,hpcloud-b1_devstack-precise-check,hpcloud-b1_bare-precise,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b2_devstack-precise-check,hpcloud-b2_bare-precise,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b3_devstack-precise-check,hpcloud-b3_bare-precise,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b4_devstack-precise-check,hpcloud-b4_bare-precise,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b5_devstack-precise-check,hpcloud-b5_bare-precise,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,tripleo-test-cloud-rh1_tripleo-f21,tripleo-test-cloud-rh1_tripleo-f22,dib_centos-6,dib_ubuntu-trusty,dib_devstack-trusty,dib_devstack-precise,dib_devstack-centos7-dib,dib_devstack-fedora21-dib,dib_fedora-22
+keys=root,nodepool,requests,shade,image,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_devstack-centos7,rax-ord_bare-precise,rax-ord_devstack-trusty,rax-ord_bare-trusty,rax-ord_devstack-centos7,rax-iad_bare-precise,rax-iad_devstack-trusty,rax-iad_bare-trusty,rax-iad_devstack-centos7,tripleo-test-cloud-rh1_tripleo-f22,dib_ubuntu-trusty,dib_devstack-trusty,dib_devstack-centos7,dib_devstack-centos7-dib,dib_fedora-23
 
 [handlers]
-keys=console,debug,normal,image,rax-dfw_devstack-precise,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_bare-centos6,rax-dfw_centos-6,rax-dfw_devstack-f21,rax-dfw_devstack-centos7,rax-ord_devstack-precise,rax-ord_bare-precise,rax-ord_devstack-trusty,rax-ord_bare-trusty,rax-ord_bare-centos6,rax-ord_centos-6,rax-ord_devstack-f21,rax-ord_devstack-centos7,rax-iad_devstack-precise,rax-iad_bare-precise,rax-iad_devstack-trusty,rax-iad_bare-trusty,rax-iad_bare-centos6,rax-iad_centos-6,rax-iad_devstack-precise-check,rax-iad_devstack-f21,rax-iad_devstack-centos7,hpcloud-region-a_devstack-precise-check,hpcloud-b1_devstack-precise-check,hpcloud-b1_bare-precise,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b2_devstack-precise-check,hpcloud-b2_bare-precise,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b3_devstack-precise-check,hpcloud-b3_bare-precise,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b4_devstack-precise-check,hpcloud-b4_bare-precise,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b5_devstack-precise-check,hpcloud-b5_bare-precise,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,tripleo-test-cloud-rh1_tripleo-f21,tripleo-test-cloud-rh1_tripleo-f22,dib_centos-6,dib_ubuntu-trusty,dib_devstack-trusty,dib_devstack-precise,dib_devstack-centos7-dib,dib_devstack-fedora21-dib,dib_fedora-22
+keys=console,debug,normal,image,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_devstack-centos7,rax-ord_bare-precise,rax-ord_devstack-trusty,rax-ord_bare-trusty,rax-ord_devstack-centos7,rax-iad_bare-precise,rax-iad_devstack-trusty,rax-iad_bare-trusty,rax-iad_devstack-centos7,tripleo-test-cloud-rh1_tripleo-f22,dib_ubuntu-trusty,dib_devstack-trusty,dib_devstack-centos7,dib_devstack-centos7-dib,dib_fedora-23
 
 [formatters]
 keys=simple
@@ -70,18 +70,6 @@ datefmt=
 # ==== individual image loggers ====
 
 
-[logger_rax-dfw_devstack-precise]
-level=DEBUG
-handlers=rax-dfw_devstack-precise
-qualname=nodepool.image.build.rax-dfw.devstack-precise
-propagate=0
-
-[handler_rax-dfw_devstack-precise]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-dfw.devstack-precise.log', 'H', 8, 30,)
-
 [logger_rax-dfw_bare-precise]
 level=DEBUG
 handlers=rax-dfw_bare-precise
@@ -118,42 +106,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/rax-dfw.bare-trusty.log', 'H', 8, 30,)
 
-[logger_rax-dfw_bare-centos6]
-level=DEBUG
-handlers=rax-dfw_bare-centos6
-qualname=nodepool.image.build.rax-dfw.bare-centos6
-propagate=0
-
-[handler_rax-dfw_bare-centos6]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-dfw.bare-centos6.log', 'H', 8, 30,)
-
-[logger_rax-dfw_centos-6]
-level=DEBUG
-handlers=rax-dfw_centos-6
-qualname=nodepool.image.build.rax-dfw.centos-6
-propagate=0
-
-[handler_rax-dfw_centos-6]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-dfw.centos-6.log', 'H', 8, 30,)
-
-[logger_rax-dfw_devstack-f21]
-level=DEBUG
-handlers=rax-dfw_devstack-f21
-qualname=nodepool.image.build.rax-dfw.devstack-f21
-propagate=0
-
-[handler_rax-dfw_devstack-f21]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-dfw.devstack-f21.log', 'H', 8, 30,)
-
 [logger_rax-dfw_devstack-centos7]
 level=DEBUG
 handlers=rax-dfw_devstack-centos7
@@ -166,18 +118,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/rax-dfw.devstack-centos7.log', 'H', 8, 30,)
 
-[logger_rax-ord_devstack-precise]
-level=DEBUG
-handlers=rax-ord_devstack-precise
-qualname=nodepool.image.build.rax-ord.devstack-precise
-propagate=0
-
-[handler_rax-ord_devstack-precise]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-ord.devstack-precise.log', 'H', 8, 30,)
-
 [logger_rax-ord_bare-precise]
 level=DEBUG
 handlers=rax-ord_bare-precise
@@ -214,42 +154,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/rax-ord.bare-trusty.log', 'H', 8, 30,)
 
-[logger_rax-ord_bare-centos6]
-level=DEBUG
-handlers=rax-ord_bare-centos6
-qualname=nodepool.image.build.rax-ord.bare-centos6
-propagate=0
-
-[handler_rax-ord_bare-centos6]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-ord.bare-centos6.log', 'H', 8, 30,)
-
-[logger_rax-ord_centos-6]
-level=DEBUG
-handlers=rax-ord_centos-6
-qualname=nodepool.image.build.rax-ord.centos-6
-propagate=0
-
-[handler_rax-ord_centos-6]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-ord.centos-6.log', 'H', 8, 30,)
-
-[logger_rax-ord_devstack-f21]
-level=DEBUG
-handlers=rax-ord_devstack-f21
-qualname=nodepool.image.build.rax-ord.devstack-f21
-propagate=0
-
-[handler_rax-ord_devstack-f21]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-ord.devstack-f21.log', 'H', 8, 30,)
-
 [logger_rax-ord_devstack-centos7]
 level=DEBUG
 handlers=rax-ord_devstack-centos7
@@ -262,18 +166,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/rax-ord.devstack-centos7.log', 'H', 8, 30,)
 
-[logger_rax-iad_devstack-precise]
-level=DEBUG
-handlers=rax-iad_devstack-precise
-qualname=nodepool.image.build.rax-iad.devstack-precise
-propagate=0
-
-[handler_rax-iad_devstack-precise]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-iad.devstack-precise.log', 'H', 8, 30,)
-
 [logger_rax-iad_bare-precise]
 level=DEBUG
 handlers=rax-iad_bare-precise
@@ -310,54 +202,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/rax-iad.bare-trusty.log', 'H', 8, 30,)
 
-[logger_rax-iad_bare-centos6]
-level=DEBUG
-handlers=rax-iad_bare-centos6
-qualname=nodepool.image.build.rax-iad.bare-centos6
-propagate=0
-
-[handler_rax-iad_bare-centos6]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-iad.bare-centos6.log', 'H', 8, 30,)
-
-[logger_rax-iad_centos-6]
-level=DEBUG
-handlers=rax-iad_centos-6
-qualname=nodepool.image.build.rax-iad.centos-6
-propagate=0
-
-[handler_rax-iad_centos-6]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-iad.centos-6.log', 'H', 8, 30,)
-
-[logger_rax-iad_devstack-precise-check]
-level=DEBUG
-handlers=rax-iad_devstack-precise-check
-qualname=nodepool.image.build.rax-iad.devstack-precise-check
-propagate=0
-
-[handler_rax-iad_devstack-precise-check]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-iad.devstack-precise-check.log', 'H', 8, 30,)
-
-[logger_rax-iad_devstack-f21]
-level=DEBUG
-handlers=rax-iad_devstack-f21
-qualname=nodepool.image.build.rax-iad.devstack-f21
-propagate=0
-
-[handler_rax-iad_devstack-f21]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-iad.devstack-f21.log', 'H', 8, 30,)
-
 [logger_rax-iad_devstack-centos7]
 level=DEBUG
 handlers=rax-iad_devstack-centos7
@@ -370,390 +214,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/rax-iad.devstack-centos7.log', 'H', 8, 30,)
 
-[logger_hpcloud-region-a_devstack-precise-check]
-level=DEBUG
-handlers=hpcloud-region-a_devstack-precise-check
-qualname=nodepool.image.build.hpcloud-region-a.devstack-precise-check
-propagate=0
-
-[handler_hpcloud-region-a_devstack-precise-check]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-region-a.devstack-precise-check.log', 'H', 8, 30,)
-
-[logger_hpcloud-b1_devstack-precise-check]
-level=DEBUG
-handlers=hpcloud-b1_devstack-precise-check
-qualname=nodepool.image.build.hpcloud-b1.devstack-precise-check
-propagate=0
-
-[handler_hpcloud-b1_devstack-precise-check]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-precise-check.log', 'H', 8, 30,)
-
-[logger_hpcloud-b1_bare-precise]
-level=DEBUG
-handlers=hpcloud-b1_bare-precise
-qualname=nodepool.image.build.hpcloud-b1.bare-precise
-propagate=0
-
-[handler_hpcloud-b1_bare-precise]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b1.bare-precise.log', 'H', 8, 30,)
-
-[logger_hpcloud-b1_bare-trusty]
-level=DEBUG
-handlers=hpcloud-b1_bare-trusty
-qualname=nodepool.image.build.hpcloud-b1.bare-trusty
-propagate=0
-
-[handler_hpcloud-b1_bare-trusty]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b1.bare-trusty.log', 'H', 8, 30,)
-
-[logger_hpcloud-b1_bare-centos6]
-level=DEBUG
-handlers=hpcloud-b1_bare-centos6
-qualname=nodepool.image.build.hpcloud-b1.bare-centos6
-propagate=0
-
-[handler_hpcloud-b1_bare-centos6]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b1.bare-centos6.log', 'H', 8, 30,)
-
-[logger_hpcloud-b1_devstack-f21]
-level=DEBUG
-handlers=hpcloud-b1_devstack-f21
-qualname=nodepool.image.build.hpcloud-b1.devstack-f21
-propagate=0
-
-[handler_hpcloud-b1_devstack-f21]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-f21.log', 'H', 8, 30,)
-
-[logger_hpcloud-b1_devstack-centos7]
-level=DEBUG
-handlers=hpcloud-b1_devstack-centos7
-qualname=nodepool.image.build.hpcloud-b1.devstack-centos7
-propagate=0
-
-[handler_hpcloud-b1_devstack-centos7]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-centos7.log', 'H', 8, 30,)
-
-[logger_hpcloud-b2_devstack-precise-check]
-level=DEBUG
-handlers=hpcloud-b2_devstack-precise-check
-qualname=nodepool.image.build.hpcloud-b2.devstack-precise-check
-propagate=0
-
-[handler_hpcloud-b2_devstack-precise-check]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-precise-check.log', 'H', 8, 30,)
-
-[logger_hpcloud-b2_bare-precise]
-level=DEBUG
-handlers=hpcloud-b2_bare-precise
-qualname=nodepool.image.build.hpcloud-b2.bare-precise
-propagate=0
-
-[handler_hpcloud-b2_bare-precise]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b2.bare-precise.log', 'H', 8, 30,)
-
-[logger_hpcloud-b2_bare-trusty]
-level=DEBUG
-handlers=hpcloud-b2_bare-trusty
-qualname=nodepool.image.build.hpcloud-b2.bare-trusty
-propagate=0
-
-[handler_hpcloud-b2_bare-trusty]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b2.bare-trusty.log', 'H', 8, 30,)
-
-[logger_hpcloud-b2_bare-centos6]
-level=DEBUG
-handlers=hpcloud-b2_bare-centos6
-qualname=nodepool.image.build.hpcloud-b2.bare-centos6
-propagate=0
-
-[handler_hpcloud-b2_bare-centos6]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b2.bare-centos6.log', 'H', 8, 30,)
-
-[logger_hpcloud-b2_devstack-f21]
-level=DEBUG
-handlers=hpcloud-b2_devstack-f21
-qualname=nodepool.image.build.hpcloud-b2.devstack-f21
-propagate=0
-
-[handler_hpcloud-b2_devstack-f21]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-f21.log', 'H', 8, 30,)
-
-[logger_hpcloud-b2_devstack-centos7]
-level=DEBUG
-handlers=hpcloud-b2_devstack-centos7
-qualname=nodepool.image.build.hpcloud-b2.devstack-centos7
-propagate=0
-
-[handler_hpcloud-b2_devstack-centos7]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-centos7.log', 'H', 8, 30,)
-
-[logger_hpcloud-b3_devstack-precise-check]
-level=DEBUG
-handlers=hpcloud-b3_devstack-precise-check
-qualname=nodepool.image.build.hpcloud-b3.devstack-precise-check
-propagate=0
-
-[handler_hpcloud-b3_devstack-precise-check]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-precise-check.log', 'H', 8, 30,)
-
-[logger_hpcloud-b3_bare-precise]
-level=DEBUG
-handlers=hpcloud-b3_bare-precise
-qualname=nodepool.image.build.hpcloud-b3.bare-precise
-propagate=0
-
-[handler_hpcloud-b3_bare-precise]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b3.bare-precise.log', 'H', 8, 30,)
-
-[logger_hpcloud-b3_bare-trusty]
-level=DEBUG
-handlers=hpcloud-b3_bare-trusty
-qualname=nodepool.image.build.hpcloud-b3.bare-trusty
-propagate=0
-
-[handler_hpcloud-b3_bare-trusty]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b3.bare-trusty.log', 'H', 8, 30,)
-
-[logger_hpcloud-b3_bare-centos6]
-level=DEBUG
-handlers=hpcloud-b3_bare-centos6
-qualname=nodepool.image.build.hpcloud-b3.bare-centos6
-propagate=0
-
-[handler_hpcloud-b3_bare-centos6]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b3.bare-centos6.log', 'H', 8, 30,)
-
-[logger_hpcloud-b3_devstack-f21]
-level=DEBUG
-handlers=hpcloud-b3_devstack-f21
-qualname=nodepool.image.build.hpcloud-b3.devstack-f21
-propagate=0
-
-[handler_hpcloud-b3_devstack-f21]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-f21.log', 'H', 8, 30,)
-
-[logger_hpcloud-b3_devstack-centos7]
-level=DEBUG
-handlers=hpcloud-b3_devstack-centos7
-qualname=nodepool.image.build.hpcloud-b3.devstack-centos7
-propagate=0
-
-[handler_hpcloud-b3_devstack-centos7]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-centos7.log', 'H', 8, 30,)
-
-[logger_hpcloud-b4_devstack-precise-check]
-level=DEBUG
-handlers=hpcloud-b4_devstack-precise-check
-qualname=nodepool.image.build.hpcloud-b4.devstack-precise-check
-propagate=0
-
-[handler_hpcloud-b4_devstack-precise-check]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-precise-check.log', 'H', 8, 30,)
-
-[logger_hpcloud-b4_bare-precise]
-level=DEBUG
-handlers=hpcloud-b4_bare-precise
-qualname=nodepool.image.build.hpcloud-b4.bare-precise
-propagate=0
-
-[handler_hpcloud-b4_bare-precise]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b4.bare-precise.log', 'H', 8, 30,)
-
-[logger_hpcloud-b4_bare-trusty]
-level=DEBUG
-handlers=hpcloud-b4_bare-trusty
-qualname=nodepool.image.build.hpcloud-b4.bare-trusty
-propagate=0
-
-[handler_hpcloud-b4_bare-trusty]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b4.bare-trusty.log', 'H', 8, 30,)
-
-[logger_hpcloud-b4_bare-centos6]
-level=DEBUG
-handlers=hpcloud-b4_bare-centos6
-qualname=nodepool.image.build.hpcloud-b4.bare-centos6
-propagate=0
-
-[handler_hpcloud-b4_bare-centos6]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b4.bare-centos6.log', 'H', 8, 30,)
-
-[logger_hpcloud-b4_devstack-f21]
-level=DEBUG
-handlers=hpcloud-b4_devstack-f21
-qualname=nodepool.image.build.hpcloud-b4.devstack-f21
-propagate=0
-
-[handler_hpcloud-b4_devstack-f21]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-f21.log', 'H', 8, 30,)
-
-[logger_hpcloud-b4_devstack-centos7]
-level=DEBUG
-handlers=hpcloud-b4_devstack-centos7
-qualname=nodepool.image.build.hpcloud-b4.devstack-centos7
-propagate=0
-
-[handler_hpcloud-b4_devstack-centos7]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-centos7.log', 'H', 8, 30,)
-
-[logger_hpcloud-b5_devstack-precise-check]
-level=DEBUG
-handlers=hpcloud-b5_devstack-precise-check
-qualname=nodepool.image.build.hpcloud-b5.devstack-precise-check
-propagate=0
-
-[handler_hpcloud-b5_devstack-precise-check]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-precise-check.log', 'H', 8, 30,)
-
-[logger_hpcloud-b5_bare-precise]
-level=DEBUG
-handlers=hpcloud-b5_bare-precise
-qualname=nodepool.image.build.hpcloud-b5.bare-precise
-propagate=0
-
-[handler_hpcloud-b5_bare-precise]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b5.bare-precise.log', 'H', 8, 30,)
-
-[logger_hpcloud-b5_bare-trusty]
-level=DEBUG
-handlers=hpcloud-b5_bare-trusty
-qualname=nodepool.image.build.hpcloud-b5.bare-trusty
-propagate=0
-
-[handler_hpcloud-b5_bare-trusty]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b5.bare-trusty.log', 'H', 8, 30,)
-
-[logger_hpcloud-b5_bare-centos6]
-level=DEBUG
-handlers=hpcloud-b5_bare-centos6
-qualname=nodepool.image.build.hpcloud-b5.bare-centos6
-propagate=0
-
-[handler_hpcloud-b5_bare-centos6]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b5.bare-centos6.log', 'H', 8, 30,)
-
-[logger_hpcloud-b5_devstack-f21]
-level=DEBUG
-handlers=hpcloud-b5_devstack-f21
-qualname=nodepool.image.build.hpcloud-b5.devstack-f21
-propagate=0
-
-[handler_hpcloud-b5_devstack-f21]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-f21.log', 'H', 8, 30,)
-
-[logger_hpcloud-b5_devstack-centos7]
-level=DEBUG
-handlers=hpcloud-b5_devstack-centos7
-qualname=nodepool.image.build.hpcloud-b5.devstack-centos7
-propagate=0
-
-[handler_hpcloud-b5_devstack-centos7]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-centos7.log', 'H', 8, 30,)
-
-[logger_tripleo-test-cloud-rh1_tripleo-f21]
-level=DEBUG
-handlers=tripleo-test-cloud-rh1_tripleo-f21
-qualname=nodepool.image.build.tripleo-test-cloud-rh1.tripleo-f21
-propagate=0
-
-[handler_tripleo-test-cloud-rh1_tripleo-f21]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/tripleo-test-cloud-rh1.tripleo-f21.log', 'H', 8, 30,)
-
 [logger_tripleo-test-cloud-rh1_tripleo-f22]
 level=DEBUG
 handlers=tripleo-test-cloud-rh1_tripleo-f22
@@ -766,18 +226,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/tripleo-test-cloud-rh1.tripleo-f22.log', 'H', 8, 30,)
 
-[logger_dib_centos-6]
-level=DEBUG
-handlers=dib_centos-6
-qualname=nodepool.image.build.centos-6
-propagate=0
-
-[handler_dib_centos-6]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/dib.centos-6.log', 'H', 8, 30,)
-
 [logger_dib_ubuntu-trusty]
 level=DEBUG
 handlers=dib_ubuntu-trusty
@@ -802,17 +250,17 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/dib.devstack-trusty.log', 'H', 8, 30,)
 
-[logger_dib_devstack-precise]
+[logger_dib_devstack-centos7]
 level=DEBUG
-handlers=dib_devstack-precise
-qualname=nodepool.image.build.devstack-precise
+handlers=dib_devstack-centos7
+qualname=nodepool.image.build.devstack-centos7
 propagate=0
 
-[handler_dib_devstack-precise]
+[handler_dib_devstack-centos7]
 level=DEBUG
 class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
-args=('<%= @image_log_document_root %>/dib.devstack-precise.log', 'H', 8, 30,)
+args=('<%= @image_log_document_root %>/dib.devstack-centos7.log', 'H', 8, 30,)
 
 [logger_dib_devstack-centos7-dib]
 level=DEBUG
@@ -826,26 +274,14 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/dib.devstack-centos7-dib.log', 'H', 8, 30,)
 
-[logger_dib_devstack-fedora21-dib]
+[logger_dib_fedora-23]
 level=DEBUG
-handlers=dib_devstack-fedora21-dib
-qualname=nodepool.image.build.devstack-fedora21-dib
+handlers=dib_fedora-23
+qualname=nodepool.image.build.fedora-23
 propagate=0
 
-[handler_dib_devstack-fedora21-dib]
+[handler_dib_fedora-23]
 level=DEBUG
 class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
-args=('<%= @image_log_document_root %>/dib.devstack-fedora21-dib.log', 'H', 8, 30,)
-
-[logger_dib_fedora-22]
-level=DEBUG
-handlers=dib_fedora-22
-qualname=nodepool.image.build.fedora-22
-propagate=0
-
-[handler_dib_fedora-22]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/dib.fedora-22.log', 'H', 8, 30,)
+args=('<%= @image_log_document_root %>/dib.fedora-23.log', 'H', 8, 30,)