Merge "Trying to ingore races related to Nova + restoring missing benchmark"

rally-scenarios/rally.yaml

@@ -676,8 +676,8 @@
         detailed: True
       runner:
         type: "constant"
-        times: 1
-        concurrency: 1
+        times: 4
+        concurrency: 4
       context:
         users:
           tenants: 1
@@ -701,7 +701,7 @@
         concurrency: 3
       context:
         users:
-          tenants: 1
+          tenants: 3
           users_per_tenant: 1
       sla:
         max_failure_percent: 0
@@ -728,7 +728,7 @@
         concurrency: 3
       context:
         users:
-          tenants: 1
+          tenants: 3
           users_per_tenant: 1
       sla:
         max_failure_percent: 0
@@ -807,6 +807,22 @@
           users_per_tenant: 2
       sla:
         max_failure_percent: 0
+    -
+      args:
+        flavor:
+            name: "m1.tiny"
+        image:
+            name: "cirros-0.3.2-x86_64-uec"
+      runner:
+        type: "constant"
+        times: 4
+        concurrency: 2
+      context:
+        users:
+          tenants: 3
+          users_per_tenant: 2
+      sla:
+        max_failure_percent: 0
 
   VMTasks.boot_runcommand_delete:
     -