From 47fc12d5ec31f7fba64a50a298f419abb94b0adc Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Tue, 7 Jan 2014 16:19:29 +0800
Subject: [PATCH] Use performance rax nodes in the gate

Start spinning up devstack-precise nodes from rax, stop spinning
up devstack-precise check nodes.

The image definition will be removed in a subsequent commit to
enable nodepool to clean up current nodes.

Change-Id: I545a4ac4ce3d63191d2c9da10cfbc968ce5522d1
---
 .../templates/nodepool/nodepool.yaml.erb      | 45 ++++++++++++++-----
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 6b421f0500..eea84667d8 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -34,6 +34,13 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-precise
+        base-image: 'Ubuntu 12.04 LTS (Precise Pangolin)'
+        min-ram: 8192
+        name-filter: 'Performance'
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
   - name: rax-ord
     region-name: 'ORD'
     service-type: 'compute'
@@ -52,6 +59,13 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-precise
+        base-image: 'Ubuntu 12.04 LTS (Precise Pangolin)'
+        min-ram: 8192
+        name-filter: 'Performance'
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-precise
         base-image: 'Ubuntu 12.04 LTS (Precise Pangolin)'
         min-ram: 8192
@@ -77,6 +91,13 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-precise
+        base-image: 'Ubuntu 12.04 LTS (Precise Pangolin)'
+        min-ram: 8192
+        name-filter: 'Performance'
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-precise
         base-image: 'Ubuntu 12.04 LTS (Precise Pangolin)'
         min-ram: 8192
@@ -201,15 +222,15 @@ targets:
       - name: devstack-precise
         min-ready: 10
         providers:
+          - name: rax-iad
+          - name: rax-dfw
+          - name: rax-ord
           - name: hpcloud-az1
           - name: hpcloud-az2
           - name: hpcloud-az3
       - name: devstack-precise-check
         min-ready: 5
         providers:
-          - name: rax-iad
-          - name: rax-dfw
-          - name: rax-ord
           - name: hpcloud-region-b
       - name: tripleo-precise
         min-ready: 1
@@ -229,15 +250,15 @@ targets:
       - name: devstack-precise
         min-ready: 10
         providers:
+          - name: rax-iad
+          - name: rax-dfw
+          - name: rax-ord
           - name: hpcloud-az1
           - name: hpcloud-az2
           - name: hpcloud-az3
       - name: devstack-precise-check
         min-ready: 5
         providers:
-          - name: rax-iad
-          - name: rax-dfw
-          - name: rax-ord
           - name: hpcloud-region-b
       - name: tripleo-precise
         min-ready: 1
@@ -257,15 +278,15 @@ targets:
       - name: devstack-precise
         min-ready: 10
         providers:
+          - name: rax-iad
+          - name: rax-dfw
+          - name: rax-ord
           - name: hpcloud-az1
           - name: hpcloud-az2
           - name: hpcloud-az3
       - name: devstack-precise-check
         min-ready: 5
         providers:
-          - name: rax-iad
-          - name: rax-dfw
-          - name: rax-ord
           - name: hpcloud-region-b
   - name: jenkins04
     jenkins:
@@ -281,13 +302,13 @@ targets:
       - name: devstack-precise
         min-ready: 10
         providers:
+          - name: rax-iad
+          - name: rax-dfw
+          - name: rax-ord
           - name: hpcloud-az1
           - name: hpcloud-az2
           - name: hpcloud-az3
       - name: devstack-precise-check
         min-ready: 5
         providers:
-          - name: rax-iad
-          - name: rax-dfw
-          - name: rax-ord
           - name: hpcloud-region-b