Browse code

Merge "Cut the heat flavor" into stable/icehouse

Jenkins authored on 2014/06/19 03:52:24
Showing 1 changed files
... ...
@@ -327,10 +327,10 @@ function configure_tempest {
327 327
         if [[ ! -z "$HEAT_CFN_IMAGE_URL" ]]; then
328 328
             iniset $TEMPEST_CONFIG orchestration image_ref $(basename "$HEAT_CFN_IMAGE_URL" ".qcow2")
329 329
         fi
330
-        # build a specialized heat flavor that is likely to be fast
330
+        # build a specialized heat flavor
331 331
         available_flavors=$(nova flavor-list)
332 332
         if [[ ! ( $available_flavors =~ 'm1.heat' ) ]]; then
333
-            nova flavor-create m1.heat 451 1024 0 2
333
+            nova flavor-create m1.heat 451 512 0 1
334 334
         fi
335 335
         iniset $TEMPEST_CONFIG orchestration instance_type "m1.heat"
336 336
         iniset $TEMPEST_CONFIG orchestration build_timeout 900