openstack: increase teuthology flavors

Ansible has higher memory requirements these days. Keep the default
flavor to the minimum because it is used during tests.

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index c22285a703cf261f7add0cf27ed009600f3e09ac..d5e2cc0130307fca21a1ae4f2785c913cfeb3cf8 100644 (file)
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -925,10 +925,14 @@ ssh access           : ssh {identity}{username}@{ip} # logs in /usr/share/nginx/
             'cpus': 1,
         }
         if self.args.simultaneous_jobs >= 100:
+            hint['ram'] = 60000 # MB
+        elif self.args.simultaneous_jobs >= 50:
             hint['ram'] = 30000 # MB
         elif self.args.simultaneous_jobs >= 25:
-            hint['ram'] = 8000 # MB
+            hint['ram'] = 15000 # MB
         elif self.args.simultaneous_jobs >= 10:
+            hint['ram'] = 8000 # MB
+        elif self.args.simultaneous_jobs >= 2:
             hint['ram'] = 4000 # MB
         if self.args.controller_cpus > 0:
             hint['cpus'] = self.args.controller_cpus