diff --git a/install_puppet.sh b/install_puppet.sh
index 718227bdd2..65768b330e 100755
--- a/install_puppet.sh
+++ b/install_puppet.sh
@@ -48,31 +48,11 @@ function is_opensuse {
         cat /etc/os-release | grep -q -e "openSUSE"
 }
 
-function is_rackspace {
-    if [ ! -f /usr/bin/xenstore-ls ]; then
-        return 1
-    fi
-
-    /usr/bin/xenstore-ls vm-data | grep -q "Rackspace"
-}
-
 #
 # Distro specific puppet installs
 #
 
 function setup_puppet_fedora {
-    # grubby on the rax f20 images can eat the "default" line of
-    # extlinux.conf when updating the kernel and create an unbootable
-    # system.  There is an unresolved bug [1], but just install the
-    # latest -- which seems to get around this -- before we update.
-    # [1] https://bugzilla.redhat.com/show_bug.cgi?id=964178
-    if grep -q 'Fedora release 20' /etc/redhat-release; then
-        if is_rackspace; then
-            sudo yum install -y fedora-release-rawhide
-            sudo yum install -y grubby --enablerepo rawhide
-        fi
-    fi
-
     yum update -y
 
     # NOTE: we preinstall lsb_release to ensure facter sets
diff --git a/modules/openstack_project/templates/nodepool/nodepool.logging.conf.erb b/modules/openstack_project/templates/nodepool/nodepool.logging.conf.erb
index 7336b8c094..c0c78f91d6 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.logging.conf.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.logging.conf.erb
@@ -6,10 +6,10 @@
 #
 
 [loggers]
-keys=root,nodepool,requests,image,rax-dfw_devstack-precise,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_bare-centos6,rax-dfw_devstack-f20,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_devstack-f20,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_devstack-precise-check,rax-iad_devstack-f20,rax-iad_devstack-f21,rax-iad_devstack-centos7,hpcloud-region-a_devstack-precise-check,hpcloud-b1_devstack-precise-check,hpcloud-b1_devstack-precise,hpcloud-b1_devstack-precise-dib,hpcloud-b1_bare-precise,hpcloud-b1_devstack-trusty,hpcloud-b1_devstack-trusty-dib,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_devstack-f20,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b1_devstack-centos7-dib,hpcloud-b2_devstack-precise-check,hpcloud-b2_devstack-precise,hpcloud-b2_devstack-precise-dib,hpcloud-b2_bare-precise,hpcloud-b2_devstack-trusty,hpcloud-b2_devstack-trusty-dib,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_devstack-f20,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b2_devstack-centos7-dib,hpcloud-b3_devstack-precise-check,hpcloud-b3_devstack-precise,hpcloud-b3_devstack-precise-dib,hpcloud-b3_bare-precise,hpcloud-b3_devstack-trusty,hpcloud-b3_devstack-trusty-dib,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_devstack-f20,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b3_devstack-centos7-dib,hpcloud-b4_devstack-precise-check,hpcloud-b4_devstack-precise,hpcloud-b4_devstack-precise-dib,hpcloud-b4_bare-precise,hpcloud-b4_devstack-trusty,hpcloud-b4_devstack-trusty-dib,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_devstack-f20,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b4_devstack-centos7-dib,hpcloud-b5_devstack-precise-check,hpcloud-b5_devstack-precise,hpcloud-b5_devstack-precise-dib,hpcloud-b5_bare-precise,hpcloud-b5_devstack-trusty,hpcloud-b5_devstack-trusty-dib,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_devstack-f20,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,hpcloud-b5_devstack-centos7-dib,tripleo-test-cloud-hp1_tripleo-precise,tripleo-test-cloud-hp1_tripleo-f20,tripleo-test-cloud-rh1_tripleo-precise,tripleo-test-cloud-rh1_tripleo-f20
+keys=root,nodepool,requests,image,rax-dfw_devstack-precise,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_bare-centos6,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_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_devstack-precise-check,rax-iad_devstack-f21,rax-iad_devstack-centos7,hpcloud-region-a_devstack-precise-check,hpcloud-b1_devstack-precise-check,hpcloud-b1_devstack-precise,hpcloud-b1_bare-precise,hpcloud-b1_devstack-trusty,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b1_devstack-centos7-dib,hpcloud-b1_devstack-fedora21-dib,hpcloud-b2_devstack-precise-check,hpcloud-b2_devstack-precise,hpcloud-b2_bare-precise,hpcloud-b2_devstack-trusty,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b2_devstack-centos7-dib,hpcloud-b2_devstack-fedora21-dib,hpcloud-b3_devstack-precise-check,hpcloud-b3_devstack-precise,hpcloud-b3_bare-precise,hpcloud-b3_devstack-trusty,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b3_devstack-centos7-dib,hpcloud-b3_devstack-fedora21-dib,hpcloud-b4_devstack-precise-check,hpcloud-b4_devstack-precise,hpcloud-b4_bare-precise,hpcloud-b4_devstack-trusty,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b4_devstack-centos7-dib,hpcloud-b4_devstack-fedora21-dib,hpcloud-b5_devstack-precise-check,hpcloud-b5_devstack-precise,hpcloud-b5_bare-precise,hpcloud-b5_devstack-trusty,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,hpcloud-b5_devstack-centos7-dib,hpcloud-b5_devstack-fedora21-dib,tripleo-test-cloud-rh1_tripleo-precise,tripleo-test-cloud-rh1_tripleo-f20
 
 [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_devstack-f20,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_devstack-f20,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_devstack-precise-check,rax-iad_devstack-f20,rax-iad_devstack-f21,rax-iad_devstack-centos7,hpcloud-region-a_devstack-precise-check,hpcloud-b1_devstack-precise-check,hpcloud-b1_devstack-precise,hpcloud-b1_devstack-precise-dib,hpcloud-b1_bare-precise,hpcloud-b1_devstack-trusty,hpcloud-b1_devstack-trusty-dib,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_devstack-f20,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b1_devstack-centos7-dib,hpcloud-b2_devstack-precise-check,hpcloud-b2_devstack-precise,hpcloud-b2_devstack-precise-dib,hpcloud-b2_bare-precise,hpcloud-b2_devstack-trusty,hpcloud-b2_devstack-trusty-dib,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_devstack-f20,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b2_devstack-centos7-dib,hpcloud-b3_devstack-precise-check,hpcloud-b3_devstack-precise,hpcloud-b3_devstack-precise-dib,hpcloud-b3_bare-precise,hpcloud-b3_devstack-trusty,hpcloud-b3_devstack-trusty-dib,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_devstack-f20,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b3_devstack-centos7-dib,hpcloud-b4_devstack-precise-check,hpcloud-b4_devstack-precise,hpcloud-b4_devstack-precise-dib,hpcloud-b4_bare-precise,hpcloud-b4_devstack-trusty,hpcloud-b4_devstack-trusty-dib,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_devstack-f20,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b4_devstack-centos7-dib,hpcloud-b5_devstack-precise-check,hpcloud-b5_devstack-precise,hpcloud-b5_devstack-precise-dib,hpcloud-b5_bare-precise,hpcloud-b5_devstack-trusty,hpcloud-b5_devstack-trusty-dib,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_devstack-f20,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,hpcloud-b5_devstack-centos7-dib,tripleo-test-cloud-hp1_tripleo-precise,tripleo-test-cloud-hp1_tripleo-f20,tripleo-test-cloud-rh1_tripleo-precise,tripleo-test-cloud-rh1_tripleo-f20
+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_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_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_devstack-precise-check,rax-iad_devstack-f21,rax-iad_devstack-centos7,hpcloud-region-a_devstack-precise-check,hpcloud-b1_devstack-precise-check,hpcloud-b1_devstack-precise,hpcloud-b1_bare-precise,hpcloud-b1_devstack-trusty,hpcloud-b1_bare-trusty,hpcloud-b1_bare-centos6,hpcloud-b1_devstack-f21,hpcloud-b1_devstack-centos7,hpcloud-b1_devstack-centos7-dib,hpcloud-b1_devstack-fedora21-dib,hpcloud-b2_devstack-precise-check,hpcloud-b2_devstack-precise,hpcloud-b2_bare-precise,hpcloud-b2_devstack-trusty,hpcloud-b2_bare-trusty,hpcloud-b2_bare-centos6,hpcloud-b2_devstack-f21,hpcloud-b2_devstack-centos7,hpcloud-b2_devstack-centos7-dib,hpcloud-b2_devstack-fedora21-dib,hpcloud-b3_devstack-precise-check,hpcloud-b3_devstack-precise,hpcloud-b3_bare-precise,hpcloud-b3_devstack-trusty,hpcloud-b3_bare-trusty,hpcloud-b3_bare-centos6,hpcloud-b3_devstack-f21,hpcloud-b3_devstack-centos7,hpcloud-b3_devstack-centos7-dib,hpcloud-b3_devstack-fedora21-dib,hpcloud-b4_devstack-precise-check,hpcloud-b4_devstack-precise,hpcloud-b4_bare-precise,hpcloud-b4_devstack-trusty,hpcloud-b4_bare-trusty,hpcloud-b4_bare-centos6,hpcloud-b4_devstack-f21,hpcloud-b4_devstack-centos7,hpcloud-b4_devstack-centos7-dib,hpcloud-b4_devstack-fedora21-dib,hpcloud-b5_devstack-precise-check,hpcloud-b5_devstack-precise,hpcloud-b5_bare-precise,hpcloud-b5_devstack-trusty,hpcloud-b5_bare-trusty,hpcloud-b5_bare-centos6,hpcloud-b5_devstack-f21,hpcloud-b5_devstack-centos7,hpcloud-b5_devstack-centos7-dib,hpcloud-b5_devstack-fedora21-dib,tripleo-test-cloud-rh1_tripleo-precise,tripleo-test-cloud-rh1_tripleo-f20
 
 [formatters]
 keys=simple
@@ -125,18 +125,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/rax-dfw.bare-centos6.log', 'H', 8, 30,)
 
-[logger_rax-dfw_devstack-f20]
-level=INFO
-handlers=rax-dfw_devstack-f20
-qualname=nodepool.image.build.rax-dfw.devstack-f20
-propagate=0
-
-[handler_rax-dfw_devstack-f20]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-dfw.devstack-f20.log', 'H', 8, 30,)
-
 [logger_rax-dfw_devstack-f21]
 level=INFO
 handlers=rax-dfw_devstack-f21
@@ -221,18 +209,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/rax-ord.bare-centos6.log', 'H', 8, 30,)
 
-[logger_rax-ord_devstack-f20]
-level=INFO
-handlers=rax-ord_devstack-f20
-qualname=nodepool.image.build.rax-ord.devstack-f20
-propagate=0
-
-[handler_rax-ord_devstack-f20]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-ord.devstack-f20.log', 'H', 8, 30,)
-
 [logger_rax-ord_devstack-f21]
 level=INFO
 handlers=rax-ord_devstack-f21
@@ -329,18 +305,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/rax-iad.devstack-precise-check.log', 'H', 8, 30,)
 
-[logger_rax-iad_devstack-f20]
-level=INFO
-handlers=rax-iad_devstack-f20
-qualname=nodepool.image.build.rax-iad.devstack-f20
-propagate=0
-
-[handler_rax-iad_devstack-f20]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-iad.devstack-f20.log', 'H', 8, 30,)
-
 [logger_rax-iad_devstack-f21]
 level=INFO
 handlers=rax-iad_devstack-f21
@@ -401,18 +365,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-precise.log', 'H', 8, 30,)
 
-[logger_hpcloud-b1_devstack-precise-dib]
-level=INFO
-handlers=hpcloud-b1_devstack-precise-dib
-qualname=nodepool.image.build.hpcloud-b1.devstack-precise-dib
-propagate=0
-
-[handler_hpcloud-b1_devstack-precise-dib]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-precise-dib.log', 'H', 8, 30,)
-
 [logger_hpcloud-b1_bare-precise]
 level=INFO
 handlers=hpcloud-b1_bare-precise
@@ -437,18 +389,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-trusty.log', 'H', 8, 30,)
 
-[logger_hpcloud-b1_devstack-trusty-dib]
-level=INFO
-handlers=hpcloud-b1_devstack-trusty-dib
-qualname=nodepool.image.build.hpcloud-b1.devstack-trusty-dib
-propagate=0
-
-[handler_hpcloud-b1_devstack-trusty-dib]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-trusty-dib.log', 'H', 8, 30,)
-
 [logger_hpcloud-b1_bare-trusty]
 level=INFO
 handlers=hpcloud-b1_bare-trusty
@@ -473,18 +413,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b1.bare-centos6.log', 'H', 8, 30,)
 
-[logger_hpcloud-b1_devstack-f20]
-level=INFO
-handlers=hpcloud-b1_devstack-f20
-qualname=nodepool.image.build.hpcloud-b1.devstack-f20
-propagate=0
-
-[handler_hpcloud-b1_devstack-f20]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-f20.log', 'H', 8, 30,)
-
 [logger_hpcloud-b1_devstack-f21]
 level=INFO
 handlers=hpcloud-b1_devstack-f21
@@ -521,6 +449,18 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-centos7-dib.log', 'H', 8, 30,)
 
+[logger_hpcloud-b1_devstack-fedora21-dib]
+level=INFO
+handlers=hpcloud-b1_devstack-fedora21-dib
+qualname=nodepool.image.build.hpcloud-b1.devstack-fedora21-dib
+propagate=0
+
+[handler_hpcloud-b1_devstack-fedora21-dib]
+level=INFO
+class=logging.handlers.TimedRotatingFileHandler
+formatter=simple
+args=('<%= @image_log_document_root %>/hpcloud-b1.devstack-fedora21-dib.log', 'H', 8, 30,)
+
 [logger_hpcloud-b2_devstack-precise-check]
 level=INFO
 handlers=hpcloud-b2_devstack-precise-check
@@ -545,18 +485,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-precise.log', 'H', 8, 30,)
 
-[logger_hpcloud-b2_devstack-precise-dib]
-level=INFO
-handlers=hpcloud-b2_devstack-precise-dib
-qualname=nodepool.image.build.hpcloud-b2.devstack-precise-dib
-propagate=0
-
-[handler_hpcloud-b2_devstack-precise-dib]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-precise-dib.log', 'H', 8, 30,)
-
 [logger_hpcloud-b2_bare-precise]
 level=INFO
 handlers=hpcloud-b2_bare-precise
@@ -581,18 +509,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-trusty.log', 'H', 8, 30,)
 
-[logger_hpcloud-b2_devstack-trusty-dib]
-level=INFO
-handlers=hpcloud-b2_devstack-trusty-dib
-qualname=nodepool.image.build.hpcloud-b2.devstack-trusty-dib
-propagate=0
-
-[handler_hpcloud-b2_devstack-trusty-dib]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-trusty-dib.log', 'H', 8, 30,)
-
 [logger_hpcloud-b2_bare-trusty]
 level=INFO
 handlers=hpcloud-b2_bare-trusty
@@ -617,18 +533,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b2.bare-centos6.log', 'H', 8, 30,)
 
-[logger_hpcloud-b2_devstack-f20]
-level=INFO
-handlers=hpcloud-b2_devstack-f20
-qualname=nodepool.image.build.hpcloud-b2.devstack-f20
-propagate=0
-
-[handler_hpcloud-b2_devstack-f20]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-f20.log', 'H', 8, 30,)
-
 [logger_hpcloud-b2_devstack-f21]
 level=INFO
 handlers=hpcloud-b2_devstack-f21
@@ -665,6 +569,18 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-centos7-dib.log', 'H', 8, 30,)
 
+[logger_hpcloud-b2_devstack-fedora21-dib]
+level=INFO
+handlers=hpcloud-b2_devstack-fedora21-dib
+qualname=nodepool.image.build.hpcloud-b2.devstack-fedora21-dib
+propagate=0
+
+[handler_hpcloud-b2_devstack-fedora21-dib]
+level=INFO
+class=logging.handlers.TimedRotatingFileHandler
+formatter=simple
+args=('<%= @image_log_document_root %>/hpcloud-b2.devstack-fedora21-dib.log', 'H', 8, 30,)
+
 [logger_hpcloud-b3_devstack-precise-check]
 level=INFO
 handlers=hpcloud-b3_devstack-precise-check
@@ -689,18 +605,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-precise.log', 'H', 8, 30,)
 
-[logger_hpcloud-b3_devstack-precise-dib]
-level=INFO
-handlers=hpcloud-b3_devstack-precise-dib
-qualname=nodepool.image.build.hpcloud-b3.devstack-precise-dib
-propagate=0
-
-[handler_hpcloud-b3_devstack-precise-dib]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-precise-dib.log', 'H', 8, 30,)
-
 [logger_hpcloud-b3_bare-precise]
 level=INFO
 handlers=hpcloud-b3_bare-precise
@@ -725,18 +629,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-trusty.log', 'H', 8, 30,)
 
-[logger_hpcloud-b3_devstack-trusty-dib]
-level=INFO
-handlers=hpcloud-b3_devstack-trusty-dib
-qualname=nodepool.image.build.hpcloud-b3.devstack-trusty-dib
-propagate=0
-
-[handler_hpcloud-b3_devstack-trusty-dib]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-trusty-dib.log', 'H', 8, 30,)
-
 [logger_hpcloud-b3_bare-trusty]
 level=INFO
 handlers=hpcloud-b3_bare-trusty
@@ -761,18 +653,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b3.bare-centos6.log', 'H', 8, 30,)
 
-[logger_hpcloud-b3_devstack-f20]
-level=INFO
-handlers=hpcloud-b3_devstack-f20
-qualname=nodepool.image.build.hpcloud-b3.devstack-f20
-propagate=0
-
-[handler_hpcloud-b3_devstack-f20]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-f20.log', 'H', 8, 30,)
-
 [logger_hpcloud-b3_devstack-f21]
 level=INFO
 handlers=hpcloud-b3_devstack-f21
@@ -809,6 +689,18 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-centos7-dib.log', 'H', 8, 30,)
 
+[logger_hpcloud-b3_devstack-fedora21-dib]
+level=INFO
+handlers=hpcloud-b3_devstack-fedora21-dib
+qualname=nodepool.image.build.hpcloud-b3.devstack-fedora21-dib
+propagate=0
+
+[handler_hpcloud-b3_devstack-fedora21-dib]
+level=INFO
+class=logging.handlers.TimedRotatingFileHandler
+formatter=simple
+args=('<%= @image_log_document_root %>/hpcloud-b3.devstack-fedora21-dib.log', 'H', 8, 30,)
+
 [logger_hpcloud-b4_devstack-precise-check]
 level=INFO
 handlers=hpcloud-b4_devstack-precise-check
@@ -833,18 +725,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-precise.log', 'H', 8, 30,)
 
-[logger_hpcloud-b4_devstack-precise-dib]
-level=INFO
-handlers=hpcloud-b4_devstack-precise-dib
-qualname=nodepool.image.build.hpcloud-b4.devstack-precise-dib
-propagate=0
-
-[handler_hpcloud-b4_devstack-precise-dib]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-precise-dib.log', 'H', 8, 30,)
-
 [logger_hpcloud-b4_bare-precise]
 level=INFO
 handlers=hpcloud-b4_bare-precise
@@ -869,18 +749,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-trusty.log', 'H', 8, 30,)
 
-[logger_hpcloud-b4_devstack-trusty-dib]
-level=INFO
-handlers=hpcloud-b4_devstack-trusty-dib
-qualname=nodepool.image.build.hpcloud-b4.devstack-trusty-dib
-propagate=0
-
-[handler_hpcloud-b4_devstack-trusty-dib]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-trusty-dib.log', 'H', 8, 30,)
-
 [logger_hpcloud-b4_bare-trusty]
 level=INFO
 handlers=hpcloud-b4_bare-trusty
@@ -905,18 +773,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b4.bare-centos6.log', 'H', 8, 30,)
 
-[logger_hpcloud-b4_devstack-f20]
-level=INFO
-handlers=hpcloud-b4_devstack-f20
-qualname=nodepool.image.build.hpcloud-b4.devstack-f20
-propagate=0
-
-[handler_hpcloud-b4_devstack-f20]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-f20.log', 'H', 8, 30,)
-
 [logger_hpcloud-b4_devstack-f21]
 level=INFO
 handlers=hpcloud-b4_devstack-f21
@@ -953,6 +809,18 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-centos7-dib.log', 'H', 8, 30,)
 
+[logger_hpcloud-b4_devstack-fedora21-dib]
+level=INFO
+handlers=hpcloud-b4_devstack-fedora21-dib
+qualname=nodepool.image.build.hpcloud-b4.devstack-fedora21-dib
+propagate=0
+
+[handler_hpcloud-b4_devstack-fedora21-dib]
+level=INFO
+class=logging.handlers.TimedRotatingFileHandler
+formatter=simple
+args=('<%= @image_log_document_root %>/hpcloud-b4.devstack-fedora21-dib.log', 'H', 8, 30,)
+
 [logger_hpcloud-b5_devstack-precise-check]
 level=INFO
 handlers=hpcloud-b5_devstack-precise-check
@@ -977,18 +845,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-precise.log', 'H', 8, 30,)
 
-[logger_hpcloud-b5_devstack-precise-dib]
-level=INFO
-handlers=hpcloud-b5_devstack-precise-dib
-qualname=nodepool.image.build.hpcloud-b5.devstack-precise-dib
-propagate=0
-
-[handler_hpcloud-b5_devstack-precise-dib]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-precise-dib.log', 'H', 8, 30,)
-
 [logger_hpcloud-b5_bare-precise]
 level=INFO
 handlers=hpcloud-b5_bare-precise
@@ -1013,18 +869,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-trusty.log', 'H', 8, 30,)
 
-[logger_hpcloud-b5_devstack-trusty-dib]
-level=INFO
-handlers=hpcloud-b5_devstack-trusty-dib
-qualname=nodepool.image.build.hpcloud-b5.devstack-trusty-dib
-propagate=0
-
-[handler_hpcloud-b5_devstack-trusty-dib]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-trusty-dib.log', 'H', 8, 30,)
-
 [logger_hpcloud-b5_bare-trusty]
 level=INFO
 handlers=hpcloud-b5_bare-trusty
@@ -1049,18 +893,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b5.bare-centos6.log', 'H', 8, 30,)
 
-[logger_hpcloud-b5_devstack-f20]
-level=INFO
-handlers=hpcloud-b5_devstack-f20
-qualname=nodepool.image.build.hpcloud-b5.devstack-f20
-propagate=0
-
-[handler_hpcloud-b5_devstack-f20]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-f20.log', 'H', 8, 30,)
-
 [logger_hpcloud-b5_devstack-f21]
 level=INFO
 handlers=hpcloud-b5_devstack-f21
@@ -1097,29 +929,17 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-centos7-dib.log', 'H', 8, 30,)
 
-[logger_tripleo-test-cloud-hp1_tripleo-precise]
+[logger_hpcloud-b5_devstack-fedora21-dib]
 level=INFO
-handlers=tripleo-test-cloud-hp1_tripleo-precise
-qualname=nodepool.image.build.tripleo-test-cloud-hp1.tripleo-precise
+handlers=hpcloud-b5_devstack-fedora21-dib
+qualname=nodepool.image.build.hpcloud-b5.devstack-fedora21-dib
 propagate=0
 
-[handler_tripleo-test-cloud-hp1_tripleo-precise]
+[handler_hpcloud-b5_devstack-fedora21-dib]
 level=INFO
 class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
-args=('<%= @image_log_document_root %>/tripleo-test-cloud-hp1.tripleo-precise.log', 'H', 8, 30,)
-
-[logger_tripleo-test-cloud-hp1_tripleo-f20]
-level=INFO
-handlers=tripleo-test-cloud-hp1_tripleo-f20
-qualname=nodepool.image.build.tripleo-test-cloud-hp1.tripleo-f20
-propagate=0
-
-[handler_tripleo-test-cloud-hp1_tripleo-f20]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/tripleo-test-cloud-hp1.tripleo-f20.log', 'H', 8, 30,)
+args=('<%= @image_log_document_root %>/hpcloud-b5.devstack-fedora21-dib.log', 'H', 8, 30,)
 
 [logger_tripleo-test-cloud-rh1_tripleo-precise]
 level=INFO
diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 8080ecfb75..b783af93e1 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -131,19 +131,6 @@ labels:
       - name: hpcloud-b3
       - name: hpcloud-b4
       - name: hpcloud-b5
-  - name: devstack-f20
-    image: devstack-f20
-    ready-script: configure_mirror.sh
-    min-ready: 0
-    providers:
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
   - name: devstack-f21
     image: devstack-f21
     ready-script: configure_mirror.sh
@@ -249,13 +236,6 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-f20
-        base-image: 'Fedora 20 (Heisenbug) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-f21
         base-image: 'Fedora 21 (PVHVM)'
         min-ram: 8192
@@ -317,13 +297,6 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-f20
-        base-image: 'Fedora 20 (Heisenbug) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-f21
         base-image: 'Fedora 21 (PVHVM)'
         min-ram: 8192
@@ -392,13 +365,6 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-f20
-        base-image: 'Fedora 20 (Heisenbug) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-f21
         base-image: 'Fedora 21 (PVHVM)'
         min-ram: 8192
@@ -482,12 +448,6 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-f20
-        base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-f21
         base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
         min-ram: 30720
@@ -562,12 +522,6 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-f20
-        base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-f21
         base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
         min-ram: 30720
@@ -641,12 +595,6 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-f20
-        base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-f21
         base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
         min-ram: 30720
@@ -721,12 +669,6 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-f20
-        base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-f21
         base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
         min-ram: 30720
@@ -802,12 +744,6 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-f20
-        base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-f21
         base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
         min-ram: 30720