From 436394f4ce9904fe2eec0866646d44aa327c559d Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@linux.vnet.ibm.com>
Date: Wed, 23 Mar 2016 09:19:46 -0700
Subject: [PATCH] Use correct flavors for centos7 and fedora23 in rax

The rax definitions for centos7 and fedora23 were missing both the
flavor selector and the bit that tells rax to use pvhvm.  This adds
those to both images for all 3 rax regions.

Change-Id: I64cf074424b3c8eebf67510ba91bf24f2680dd0d
---
 nodepool/nodepool.yaml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 8faebd1359..35292f98be 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -180,13 +180,21 @@ providers:
         diskimage: fedora-23
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+        name-filter: 'Performance'
         config-drive: true
+        meta:
+          vm_mode: hvm
+          xenapi_use_agent: 'false'
       - name: centos-7
         min-ram: 8192
         diskimage: centos-7
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+        name-filter: 'Performance'
         config-drive: true
+        meta:
+          vm_mode: hvm
+          xenapi_use_agent: 'false'
       - name: devstack-centos7
         base-image: 'CentOS 7 (PVHVM)'
         min-ram: 8192
@@ -242,13 +250,21 @@ providers:
         diskimage: fedora-23
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+        name-filter: 'Performance'
         config-drive: true
+        meta:
+          vm_mode: hvm
+          xenapi_use_agent: 'false'
       - name: centos-7
         min-ram: 8192
         diskimage: centos-7
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+        name-filter: 'Performance'
         config-drive: true
+        meta:
+          vm_mode: hvm
+          xenapi_use_agent: 'false'
       - name: devstack-centos7
         base-image: 'CentOS 7 (PVHVM)'
         min-ram: 8192
@@ -304,13 +320,21 @@ providers:
         diskimage: fedora-23
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+        name-filter: 'Performance'
         config-drive: true
+        meta:
+          vm_mode: hvm
+          xenapi_use_agent: 'false'
       - name: centos-7
         min-ram: 8192
         diskimage: centos-7
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+        name-filter: 'Performance'
         config-drive: true
+        meta:
+          vm_mode: hvm
+          xenapi_use_agent: 'false'
       - name: devstack-centos7
         base-image: 'CentOS 7 (PVHVM)'
         min-ram: 8192