diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 7f8fcac794..04f3b045bf 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -143,6 +143,18 @@ labels:
       - name: hpcloud-b3
       - name: hpcloud-b4
       - name: hpcloud-b5
+  - name: bare-f20
+    image: bare-f20
+    min-ready: 1
+    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-f20-virt-preview
     image: devstack-f20-virt-preview
     ready-script: configure_mirror.sh
@@ -232,6 +244,13 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: bare-f20
+        base-image: 'Fedora 20 (Heisenbug) (PVHVM)'
+        min-ram: 8192
+        name-filter: 'Performance'
+        setup: prepare_node_bare.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-f20-virt-preview
         base-image: 'Fedora 20 (Heisenbug) (PVHVM)'
         min-ram: 8192
@@ -307,6 +326,13 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: bare-f20
+        base-image: 'Fedora 20 (Heisenbug) (PVHVM)'
+        min-ram: 8192
+        name-filter: 'Performance'
+        setup: prepare_node_bare.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-f20-virt-preview
         base-image: 'Fedora 20 (Heisenbug) (PVHVM)'
         min-ram: 8192
@@ -389,6 +415,13 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: bare-f20
+        base-image: 'Fedora 20 (Heisenbug) (PVHVM)'
+        min-ram: 8192
+        name-filter: 'Performance'
+        setup: prepare_node_bare.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-f20-virt-preview
         base-image: 'Fedora 20 (Heisenbug) (PVHVM)'
         min-ram: 8192
@@ -479,6 +512,12 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: bare-f20
+        base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
+        min-ram: 30720
+        setup: prepare_node_bare.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
         base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140806) - Partner Image'
         min-ram: 30720
@@ -543,6 +582,12 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: bare-f20
+        base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
+        min-ram: 30720
+        setup: prepare_node_bare.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
         base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140806) - Partner Image'
         min-ram: 30720
@@ -607,6 +652,12 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: bare-f20
+        base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
+        min-ram: 30720
+        setup: prepare_node_bare.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
         base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140806) - Partner Image'
         min-ram: 30720
@@ -672,6 +723,12 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: bare-f20
+        base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
+        min-ram: 30720
+        setup: prepare_node_bare.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
         base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140806) - Partner Image'
         min-ram: 30720
@@ -738,6 +795,12 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: bare-f20
+        base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
+        min-ram: 30720
+        setup: prepare_node_bare.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
         base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140806) - Partner Image'
         min-ram: 30720