commit ace8245db3ebb132ac8cb96bc39b9657b108d932
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Oct 26 09:21:58 2018 +0000
committer Gerrit Code Review <mail@domain.com> Fri Oct 26 09:21:58 2018 +0000
tree 57143586d7819cfbf1c244a02fca7222d7708274
parent 8e75c9ac0bfdbcbc42337b886a6028ab01c798fd
parent 71d9c66802819feed94b603c2aa935c4dfdc5463

Merge "Fix parameter vnc_server_header for multinode configuration"

_modules/runtest/tempest_sections/heat_plugin.py

diff --git a/_modules/runtest/tempest_sections/heat_plugin.py b/_modules/runtest/tempest_sections/heat_plugin.py
index da680cd..945ea39 100644
--- a/_modules/runtest/tempest_sections/heat_plugin.py
+++ b/_modules/runtest/tempest_sections/heat_plugin.py
@@ -165,11 +165,10 @@
             'nova.client.server.admin_identity.flavor', c)
         if not flavors:
             return
-        instance_type_name, _ = sorted(
-            flavors.items(),
-            key=lambda (k, v): (v, k)
-        )[-1]
-        return instance_type_name
+        flavor = [f for f in flavors if flavors[f]['disk'] > 3]
+        if not flavor:
+            return
+        return flavor[0]
 
     @property
     def ip_version_for_ssh(self):