commit 404fbfefe24a667ec4c13ca3e043edb4a551fe90
author Jenkins <jenkins@review.openstack.org> Mon Apr 14 19:21:08 2014 +0000
committer Gerrit Code Review <review@openstack.org> Mon Apr 14 19:21:08 2014 +0000
tree 4c0b8a0516948079311b5ba381984f483332da38
parent affc467f2a9e736178448fd798b3d194c3cb2b78
parent 669c4fc4afd7c8e80f8c1eed202ef8fdc2c340f2

Merge "increase heat guests"

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 97e6d22..5122695 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -322,9 +322,18 @@
     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