From 669c4fc4afd7c8e80f8c1eed202ef8fdc2c340f2 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean.dague@samsung.com>
Date: Thu, 3 Apr 2014 11:28:01 -0400
Subject: [PATCH] increase heat guests

heat is booting a real fedora, which makes m1.tiny completely not
appropriate. We want to limit disk io, so boot as a 2 vcpu 1G guest
to try to get some better performance out of these guests when
tested in tempest.

Change-Id: I80de67080a5106c2d8921e146c37c614ee5f8abf
---
 lib/tempest | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/tempest b/lib/tempest
index 0b5f332672..639a0d02c9 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -320,9 +320,18 @@ function configure_tempest {
     iniset $TEMPEST_CONFIG boto http_socket_timeout 30
     iniset $TEMPEST_CONFIG boto ssh_user ${DEFAULT_INSTANCE_USER:-cirros}
 
-    # Orchestration test image
-    if [[ ! -z "$HEAT_CFN_IMAGE_URL" ]]; then
-        iniset $TEMPEST_CONFIG orchestration image_ref $(basename "$HEAT_CFN_IMAGE_URL" ".qcow2")
+    # Orchestration Tests
+    if is_service_enabled heat; then
+        if [[ ! -z "$HEAT_CFN_IMAGE_URL" ]]; then
+            iniset $TEMPEST_CONFIG orchestration image_ref $(basename "$HEAT_CFN_IMAGE_URL" ".qcow2")
+        fi
+        # build a specialized heat flavor that is likely to be fast
+        available_flavors=$(nova flavor-list)
+        if [[ ! ( $available_flavors =~ 'm1.heat' ) ]]; then
+            nova flavor-create m1.heat 451 1024 0 2
+        fi
+        iniset $TEMPEST_CONFIG orchestration instance_type "m1.heat"
+        iniset $TEMPEST_CONFIG orchestration build_timeout 900
     fi
 
     # Scenario