From f6a3ce17767136bea74a71919bc633f93eecf8d6 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 8 Jan 2015 09:38:08 +1100
Subject: [PATCH] Remove bare-f20 nodes

bare-f20 nodes are not used currently; there was some effort to get an
amqp unit-test working on them but I think that has moved in a
different direction.  New testing should focus on f21

Change-Id: I67b2117057d647052e6a2f705c420b1eb0ec1435
---
 .../templates/nodepool/nodepool.yaml.erb      | 63 -------------------
 1 file changed, 63 deletions(-)

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index cd7824a865..edaaa3c701 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -165,18 +165,6 @@ 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-f21
     image: devstack-f21
     ready-script: configure_mirror.sh
@@ -286,13 +274,6 @@ 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-f21
         base-image: 'Fedora 21 (PVHVM)'
         min-ram: 8192
@@ -368,13 +349,6 @@ 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-f21
         base-image: 'Fedora 21 (PVHVM)'
         min-ram: 8192
@@ -457,13 +431,6 @@ 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-f21
         base-image: 'Fedora 21 (PVHVM)'
         min-ram: 8192
@@ -564,12 +531,6 @@ 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: devstack-f21
         base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
         min-ram: 30720
@@ -661,12 +622,6 @@ 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: devstack-f21
         base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
         min-ram: 30720
@@ -775,12 +730,6 @@ providers:
         diskimage: devstack-centos7-dib
         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 20140927) - Partner Image'
         min-ram: 30720
@@ -856,12 +805,6 @@ 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: devstack-f21
         base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
         min-ram: 30720
@@ -955,12 +898,6 @@ 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: devstack-f21
         base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
         min-ram: 30720