commit e97bceca8c96e3eb2d4d5c4e6fd03277294d9251
author Jenkins <jenkins@review.openstack.org> Mon Nov 16 06:03:03 2015 +0000
committer Gerrit Code Review <review@openstack.org> Mon Nov 16 06:03:03 2015 +0000
tree 9d2f71174fdc0fe1284860dedb2808a123d460e0
parent 6e7b3aa723692d3682057b22a99d0b2a8b08d76a
parent 6cd616a9edf6561ebc802f3083eb24f2713d4e96

Merge "Disable resize tests in Tempest if using cells with custom flavors"

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 32630db..691ad86 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -377,6 +377,15 @@
         iniset $TEMPEST_CONFIG compute-feature-enabled shelve False
         # Cells doesn't support hot-plugging virtual interfaces.
         iniset $TEMPEST_CONFIG compute-feature-enabled interface_attach False
+
+        if  [[ -z "$DEFAULT_INSTANCE_TYPE" ]]; then
+            # Cells supports resize but does not currently work with devstack
+            # because of the custom flavors created for Tempest runs which are
+            # not in the cells database.
+            # TODO(mriedem): work on adding a nova-manage command to sync
+            # flavors into the cells database.
+            iniset $TEMPEST_CONFIG compute-feature-enabled resize False
+        fi
     fi
 
     # Network