diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 86ce3436eb..810859818f 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -188,16 +188,6 @@ labels:
       - name: hpcloud-b3
       - name: hpcloud-b4
       - name: hpcloud-b5
-  - name: devstack-fedora21-dib
-    image: devstack-fedora21-dib
-    ready-script: configure_mirror.sh
-    min-ready: 1
-    providers:
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
   - name: tripleo-precise
     image: tripleo-precise
     min-ready: 8
@@ -523,12 +513,6 @@ providers:
         diskimage: devstack-centos7-dib
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-fedora21-dib
-        min-ram: 30720
-        diskimage: devstack-fedora21-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-
   - name: hpcloud-b2
     region-name: 'region-b.geo-1'
     service-type: 'compute'
@@ -613,11 +597,6 @@ providers:
         diskimage: devstack-centos7-dib
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-fedora21-dib
-        min-ram: 30720
-        diskimage: devstack-fedora21-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
   - name: hpcloud-b3
     region-name: 'region-b.geo-1'
     service-type: 'compute'
@@ -702,11 +681,6 @@ providers:
         diskimage: devstack-centos7-dib
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-fedora21-dib
-        min-ram: 30720
-        diskimage: devstack-fedora21-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
   - name: hpcloud-b4
     region-name: 'region-b.geo-1'
     service-type: 'compute'
@@ -792,11 +766,6 @@ providers:
         diskimage: devstack-centos7-dib
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-fedora21-dib
-        min-ram: 30720
-        diskimage: devstack-fedora21-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
   - name: hpcloud-b5
     region-name: 'region-b.geo-1'
     service-type: 'compute'
@@ -883,11 +852,6 @@ providers:
         diskimage: devstack-centos7-dib
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-fedora21-dib
-        min-ram: 30720
-        diskimage: devstack-fedora21-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
   - name: tripleo-test-cloud-hp1
     service-type: 'compute'
     service-name: 'nova'
@@ -1054,17 +1018,3 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_IMAGE_CACHE: /opt/dib_cache
       QEMU_IMG_OPTIONS: compat=0.10
-  - name: devstack-fedora21-dib
-    elements:
-      - fedora
-      - vm
-      - puppet
-      - nodepool-base
-      - node-devstack
-    release: 21
-    env-vars:
-      TMPDIR: /opt/dib_tmp
-      DIB_IMAGE_CACHE: /opt/dib_cache
-      DIB_CLOUD_IMAGES: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.qcow2
-      BASE_IMAGE_FILE: Fedora-Cloud-Base-20141203-21.x86_64.qcow2
-      QEMU_IMG_OPTIONS: compat=0.10