diff --git a/rally/rally_scenarios.json b/rally/rally_scenarios.json
index 1463350..a0f169e 100644
--- a/rally/rally_scenarios.json
+++ b/rally/rally_scenarios.json
@@ -1,7 +1,5 @@
 {% set flavor_name = flavor_name or "m1.tiny" %}
-{% set flavor_name_ubuntu = flavor_name_ubuntu or "m1.medium" %}
 {% set image_name = image_name or "testvm" %}
-{% set image_name_ubuntu = image_name_ubuntu or "Ubuntu" %}
 {% set volume_type = volume_type or "default" %}
 {% set availability_zone = "nova" %}
 {% set concurrency = 1 %}
@@ -9,697 +7,488 @@
 {% set times = 1 %}
 {% set users = 1 %}
 {% set tenants = 1 %}
-{% set rbd_image = "/home/rally/cvp-configuration/cirros-0.3.4-x86_64-disk.img" %}
-{% set heat_template = "/home/rally/cvp-configuration/rally/default.yaml.template" %}
-{% set ext_net_name = "floating" %}
-{% set script_file = script_file or "/home/rally/cvp-configuration/rally/instance_test.sh" %}
+{% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
+{% set heat_template = "/home/rally/source/cvp-configuration/rally/default.yaml.template" %}
+{% set fixed_net = "${FIXED_NET}" %}
+{% set block_migration = true %}
 {
-"KeystoneBasic.authenticate_user_and_validate_token": [
-        {
-            "args": {},
-            "runner": {
-                "type": "constant",
-                "times": {{times}},
-                "concurrency": {{concurrency}}
-            },
-            "sla": {
-                "failure_rate": {
-                    "max": 0
-                }
-            }
-        }
-    ],
-    "Authenticate.validate_cinder": [
-        {
-            "args": {
-                "repetitions": 2
-            },
-            "runner": {
-                "type": "constant",
-                "times": {{times}},
-                "concurrency": {{concurrency}}
-            },
-            "context": {
-                "users": {
-                    "users_per_tenant": {{users}},
-                    "tenants": {{tenants}}
-                },
-            "api_versions@openstack":
-            {
-            "cinder": {"service_type": "volumev3"}
-            }
-            },
-            "sla": {
-                "failure_rate": {
-                    "max": 0
-                }
-            }
-        }
-    ],
-    "Authenticate.validate_glance": [
-        {
-            "args": {
-                "repetitions": 2
-            },
-            "runner": {
-                "type": "constant",
-                "times": {{times}},
-                "concurrency": {{concurrency}}
-            },
-            "context": {
-                "users": {
-                    "users_per_tenant": {{users}},
-                    "tenants": {{tenants}}
-                }
-            },
-            "sla": {
-                "failure_rate": {
-                    "max": 0
-                }
-            }
-        }
-    ],
-    "Authenticate.validate_heat": [
-        {
-            "args": {
-                "repetitions": 2
-            },
-            "runner": {
-                "type": "constant",
-                "times": {{times}},
-                "concurrency": {{concurrency}}
-            },
-            "context": {
-                "users": {
-                    "users_per_tenant": {{users}},
-                    "tenants": {{tenants}}
-                }
-            },
-            "sla": {
-                "failure_rate": {
-                    "max": 0
-                }
-            }
-        }
-    ],
-    "Authenticate.validate_nova": [
-        {
-            "args": {
-                "repetitions": 2
-            },
-            "runner": {
-                "type": "constant",
-                "times": {{times}},
-                "concurrency": {{concurrency}}
-            },
-            "context": {
-                "users": {
-                    "users_per_tenant": {{users}},
-                    "tenants": {{tenants}}
-                }
-            },
-            "sla": {
-                "failure_rate": {
-                    "max": 0
-                }
-            }
-        }
-    ],
-    "Authenticate.validate_neutron": [
-        {
-            "args": {
-                "repetitions": 2
-            },
-            "runner": {
-                "type": "constant",
-                "times": {{times}},
-                "concurrency": {{concurrency}}
-            },
-            "context": {
-                "users": {
-                    "users_per_tenant": {{users}},
-                    "tenants": {{tenants}}
-                }
-            },
-            "sla": {
-                "failure_rate": {
-                    "max": 0
-                }
-            }
-        }
-    ],
-    "VMTasks.boot_runcommand_delete": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "{{flavor_name_ubuntu}}"
-                },
-                "image": {
-                    "name": "{{image_name_ubuntu}}"
-                },
-                "volume_args": {
-                    "size": 10
-                },
-                "floating_network": "{{ext_net_name}}",
-                "use_floating_ip": true,
-                "wait_for_ping": false,
-                "force_delete": false,
-                "command": {
-                    "interpreter": "/bin/sh",
-                    "script_file": "{{script_file}}"
-                },
-                "username": "ubuntu"
-            },
-            "runner": {
-                "type": "constant",
-                "times": 1,
-                "concurrency": 1
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-            "api_versions@openstack":
-            {
-                "cinder": {"service_type": "volumev3"}
-            },
-                "network": {}
-            }
-        }
-    ],
-   "NovaServers.boot_and_migrate_server": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "{{flavor_name}}"
-                },
-                "image": {
-                    "name": "{{image_name}}"
-                }
-            },
-            "runner": {
-                "type": "constant",
-                "times": {{times}},
-                "concurrency": {{concurrency}}
-            },
-            "context": {
-                "users": {
-                    "users_per_tenant": {{users}},
-                    "tenants": {{tenants}}
-                }
-            },
-            "sla": {
-                "failure_rate": {
-                    "max": 0
-                }
-            }
-        }
-    ],
-   "NovaServers.boot_and_live_migrate_server": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "{{flavor_name}}"
-                },
-                "image": {
-                    "name": "{{image_name}}"
-                },
-                "block_migration": false
-            },
-            "runner": {
-                "type": "constant",
-                "concurrency": {{concurrency}},
-                "times": {{times}}
-            },
-            "context": {
-                "users": {
-                    "users_per_tenant": {{users}},
-                    "tenants": {{tenants}}
-                }
-            },
-            "sla": {
-                "failure_rate": {
-                    "max": 0
-                }
-            }
-        }
-    ],
-  "NovaServers.boot_and_associate_floating_ip": [
-    {
-      "runner": {
-        "type": "constant",
-        "concurrency": {{concurrency}},
-        "times": {{times}}
-      },
-      "args": {
-        "flavor": {
-          "name": "{{flavor_name}}"
-        },
-        "image": {
-          "name": "{{image_name}}"
-        },
-        "auto_assign_nic": true,
-        "availability_zone": "{{availability_zone}}"
-      },
-      "context": {
-        "users": {
-          "users_per_tenant": {{users}},
-          "tenants": {{tenants}}
-        },
-        "network": {},
-        "quotas": {
-          "nova": {
-            "instances": -1,
-            "cores": -1,
-            "ram": -1,
-            "floating_ips": -1,
-            "key_pairs": -1,
-            "security_groups": -1,
-            "security_group_rules": -1
-            }
-        }
-      },
-      "sla": {
-        "failure_rate": {
-        "max": 0
-        }
-      }
-    }
+  "KeystoneBasic.authenticate_user_and_validate_token": [
+  {
+    "args": {},
+    "runner": {
+      "type": "constant",
+      "times": {{times}},
+      "concurrency": {{concurrency}}
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
   ],
-  "NovaServers.boot_and_delete_server": [
-    {
-      "args": {
-        "flavor": {
-          "name": "{{flavor_name_ubuntu}}"
-        },
-      "image": {
-        "name": "{{image_name_ubuntu}}"
+  "KeystoneBasic.create_tenant_with_users": [
+  {
+    "args": { "users_per_tenant": 10 },
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ],
+  "Authenticate.validate_cinder": [
+  {
+    "args": { "repetitions": 2 },
+    "runner": {
+      "type": "constant",
+      "times": {{times}},
+      "concurrency": {{concurrency}}
+    },
+    "context": {
+      "users": {
+        "users_per_tenant": {{users}},
+        "tenants": {{tenants}}
       },
-      "detailed": true,
-      "auto_assign_nic": true,
-      "availability_zone": "{{availability_zone}}"
-      },
-      "runner": {
-        "type": "constant",
-        "concurrency": {{concurrency}},
-        "times": {{times}}
-      },
-      "context": {
-        "users": {
-          "tenants": {{users}},
-          "users_per_tenant": {{tenants}}
-        },
-        "network": {},
-        "quotas": {
-          "nova": {
-            "instances": -1,
-            "cores": -1,
-            "ram": -1,
-            "floating_ips": -1,
-            "key_pairs": -1,
-            "security_groups": -1,
-            "security_group_rules": -1
-          }
-        }
-      },
-      "sla": {
-        "failure_rate": {
-          "max": 0
-          }
+      "api_versions@openstack": { "cinder": {"service_type": "volumev3"} }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ],
+  "Authenticate.validate_glance": [
+  {
+    "args": { "repetitions": 2 },
+    "runner": {
+      "type": "constant",
+      "times": {{times}},
+      "concurrency": {{concurrency}}
+    },
+    "context": {
+      "users": {
+        "users_per_tenant": {{users}},
+        "tenants": {{tenants}}
       }
     },
-    {
-      "args": {
-        "flavor": {
-          "name": "{{flavor_name}}"
-        },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ],
+  "Authenticate.validate_heat": [
+  {
+    "args": { "repetitions": 2 },
+    "runner": {
+      "type": "constant",
+      "times": {{times}},
+      "concurrency": {{concurrency}}
+    },
+    "context": {
+      "users": {
+        "users_per_tenant": {{users}},
+        "tenants": {{tenants}}
+      }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ],
+  "Authenticate.validate_nova": [
+  {
+    "args": { "repetitions": 2 },
+    "runner": {
+      "type": "constant",
+      "times": {{times}},
+      "concurrency": {{concurrency}}
+    },
+    "context": {
+      "users": {
+        "users_per_tenant": {{users}},
+        "tenants": {{tenants}}
+      }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ],
+  "Authenticate.validate_neutron": [
+  {
+    "args": { "repetitions": 2 },
+    "runner": {
+      "type": "constant",
+      "times": {{times}},
+      "concurrency": {{concurrency}}
+    },
+    "context": {
+      "users": {
+        "users_per_tenant": {{users}},
+        "tenants": {{tenants}}
+      }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ],
+  "NovaServers.boot_and_migrate_server": [
+  {
+    "args": {
+      "flavor": {
+        "name": "{{flavor_name}}"
+      },
       "image": {
         "name": "{{image_name}}"
       },
-      "detailed": true,
-      "auto_assign_nic": true,
-      "availability_zone": "{{availability_zone}}"
+      "nics": [
+        {"net-id": "{{fixed_net}}"}
+      ]
+    },
+    "runner": {
+      "type": "constant",
+      "times": {{times}},
+      "concurrency": {{concurrency}}
+    },
+    "context": {
+      "users": {
+        "users_per_tenant": {{users}},
+        "tenants": {{tenants}}
       },
-      "runner": {
-        "type": "constant",
-        "concurrency": {{concurrency}},
-        "times": {{times}}
-      },
-      "context": {
-        "users": {
-          "tenants": {{users}},
-          "users_per_tenant": {{tenants}}
-        },
-        "network": {},
-        "quotas": {
-          "nova": {
-            "instances": -1,
-            "cores": -1,
-            "ram": -1,
-            "floating_ips": -1,
-            "key_pairs": -1,
-            "security_groups": -1,
-            "security_group_rules": -1
-          }
+      "quotas": {
+        "nova": {
+          "instances": -1,
+          "cores": -1,
+          "ram": -1,
+          "key_pairs": -1,
+          "security_groups": -1,
+          "security_group_rules": -1
         }
-      },
-      "sla": {
-        "failure_rate": {
-          "max": 0
-          }
       }
-    }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ],
+  "NovaServers.boot_and_live_migrate_server": [
+  {
+    "args": {
+      "flavor": {
+        "name": "{{flavor_name}}"
+      },
+      "image": {
+        "name": "{{image_name}}"
+      },
+      "nics": [
+        {"net-id": "{{fixed_net}}"}
+      ],
+      "block_migration": {{block_migration}}
+    },
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "context": {
+      "users": {
+        "users_per_tenant": {{users}},
+        "tenants": {{tenants}}
+      },
+      "quotas": {
+        "nova": {
+          "instances": -1,
+          "cores": -1,
+          "ram": -1,
+          "key_pairs": -1,
+          "security_groups": -1,
+          "security_group_rules": -1
+        }
+      }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ],
+  "NovaServers.boot_and_delete_server": [
+  {
+    "args": {
+      "flavor": {
+        "name": "{{flavor_name}}"
+      },
+      "image": {
+        "name": "{{image_name}}"
+      },
+      "nics": [
+        {"net-id": "{{fixed_net}}"}
+      ],
+      "detailed": true,
+      "availability_zone": "{{availability_zone}}"
+    },
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "context": {
+      "users": {
+        "tenants": {{users}},
+        "users_per_tenant": {{tenants}}
+      },
+      "quotas": {
+        "nova": {
+          "instances": -1,
+          "cores": -1,
+          "ram": -1,
+          "key_pairs": -1,
+          "security_groups": -1,
+          "security_group_rules": -1
+        }
+      }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
   ],
   "NovaServers.boot_server_from_volume_and_delete": [
-    {
-      "args": {
-        "flavor": {
-          "name": "{{flavor_name}}"
+  {
+    "args": {
+      "flavor": {
+        "name": "{{flavor_name}}"
+      },
+      "image": {
+        "name": "{{image_name}}"
+      },
+      "nics": [
+        {"net-id": "{{fixed_net}}"}
+      ],
+      "volume_size": {{volume_size}},
+      "volume_type": "{{volume_type}}",
+      "force_delete": false,
+      "availability_zone": "{{availability_zone}}"
+    },
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "context": {
+      "users": {
+        "tenants": {{users}},
+        "users_per_tenant": {{tenants}}
+      },
+      "api_versions@openstack": { "cinder": {"service_type": "volumev3"} },
+      "quotas": {
+        "nova": {
+          "instances": -1,
+          "cores": -1,
+          "ram": -1,
+          "key_pairs": -1,
+          "security_groups": -1,
+          "security_group_rules": -1
         },
-        "image": {
-          "name": "{{image_name}}"
-        },
-        "volume_size": {{volume_size}},
-        "volume_type": "{{volume_type}}",
-        "force_delete": false,
-        "auto_assign_nic": true,
-        "availability_zone": "{{availability_zone}}"
-        },
-        "runner": {
-          "type": "constant",
-          "concurrency": {{concurrency}},
-          "times": {{times}}
-        },
-        "context": {
-          "users": {
-            "tenants": {{users}},
-            "users_per_tenant": {{tenants}}
-          },
-            "api_versions@openstack":
-            {
-                "cinder": {"service_type": "volumev3"}
-            },
-          "network": {},
-          "quotas": {
-            "nova": {
-              "instances": -1,
-              "cores": -1,
-              "ram": -1,
-              "floating_ips": -1,
-              "key_pairs": -1,
-              "security_groups": -1,
-              "security_group_rules": -1
-            },
-            "cinder": {
-          "volumes": -1
-            }
-          }
-        },
-        "sla": {
-          "failure_rate": {
-            "max": 0
+        "cinder": { "volumes": -1 }
+      }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ],
+  "NeutronNetworks.create_and_delete_networks": [
+  {
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "context": {
+      "users": {
+        "tenants": {{users}},
+        "users_per_tenant": {{tenants}}
+      },
+      "quotas": {
+        "neutron": { "network": -1 }
+      }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ],
+  "NeutronNetworks.create_and_delete_ports": [
+  {
+    "args": {
+      "network_create_args": {},
+      "port_create_args": {},
+      "ports_per_network": 10
+    },
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "context": {
+      "users": {
+        "tenants": {{users}},
+        "users_per_tenant": {{tenants}}
+      },
+      "quotas": {
+        "neutron": {
+          "network": -1,
+          "port": -1
         }
       }
-    }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
   ],
-    "NeutronNetworks.create_and_delete_networks": [
-        {
-            "args": {
-                "network_create_args": {}
-            },
-            "runner": {
-                "type": "constant",
-                "concurrency": {{concurrency}},
-                "times": {{times}}
-            },
-            "context": {
-                "users": {
-                    "tenants": {{users}},
-                    "users_per_tenant": {{tenants}}
-                },
-                "quotas": {
-                    "neutron": {
-                        "network": -1
-                    }
-                }
-            },
-           "sla": {
-                "failure_rate": {
-                "max": 0
-                }
-           }
+  "NeutronNetworks.create_and_delete_routers": [
+  {
+    "args": {
+      "network_create_args": {},
+      "subnet_create_args": {},
+      "subnet_cidr_start": "1.1.0.0/30",
+      "subnets_per_network": 2,
+      "router_create_args": {}
+    },
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "context": {
+      "users": {
+        "tenants": {{users}},
+        "users_per_tenant": {{tenants}}
+      },
+      "quotas": {
+        "neutron": {
+          "network": -1,
+          "subnet": -1,
+          "router": -1
         }
-    ],
-    "NeutronNetworks.create_and_delete_ports": [
-        {
-            "args": {
-                "network_create_args": {},
-                "port_create_args": {},
-                "ports_per_network": 10
-            },
-            "runner": {
-                "type": "constant",
-                "concurrency": {{concurrency}},
-                "times": {{times}}
-            },
-            "context": {
-                "network": {},
-                "users": {
-                    "tenants": {{users}},
-                    "users_per_tenant": {{tenants}}
-                },
-                "quotas": {
-                    "neutron": {
-                        "network": -1,
-                        "port": -1
-                    }
-                }
-            },
-           "sla": {
-                "failure_rate": {
-                "max": 0
-                }
-           }
-        }
-    ],
-    "NeutronNetworks.create_and_delete_routers": [
-        {
-            "args": {
-                "network_create_args": {},
-                "subnet_create_args": {},
-                "subnet_cidr_start": "1.1.0.0/30",
-                "subnets_per_network": 2,
-                "router_create_args": {}
-            },
-            "runner": {
-                "type": "constant",
-                "concurrency": {{concurrency}},
-                "times": {{times}}
-            },
-            "context": {
-                "network": {},
-                "users": {
-                    "tenants": {{users}},
-                    "users_per_tenant": {{tenants}}
-                },
-                "quotas": {
-                    "neutron": {
-                        "network": -1,
-                        "subnet": -1,
-                        "router": -1
-                    }
-                }
-            },
-           "sla": {
-                "failure_rate": {
-                "max": 0
-                }
-           }
-        }
+      }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ],
+  "CinderVolumes.create_and_attach_volume": [
+  {
+    "args": {
+      "size": {{volume_size}},
+      "image": {
+        "name": "{{image_name}}"
+      },
+      "flavor": {
+        "name": "{{flavor_name}}"
+      },
+      "nics": [
+        {"net-id": "{{fixed_net}}"}
       ],
-    "CinderVolumes.create_and_attach_volume": [
-        {
-            "args": {
-                "size": {{volume_size}},
-                "image": {
-                    "name": "{{image_name}}"
-                },
-                "flavor": {
-                    "name": "{{flavor_name}}"
-                },
-                "create_volume_params": {
-                },
-                "auto_assign_nic": true,
-                "availability_zone": "{{availability_zone}}"
-            },
-            "runner": {
-                "type": "constant",
-                "concurrency": {{concurrency}},
-                "times": {{times}}
-            },
-            "context": {
-                "users": {
-                    "tenants": {{users}},
-                    "users_per_tenant": {{tenants}}
-                },
-            "api_versions@openstack":
-            {
-                "cinder": {"service_type": "volumev3"}
-            },
-                "network": {},
-                "quotas": {
-                        "cinder": {
-                                "volumes": -1
-                                }
-                }
-            },
-           "sla": {
-                "failure_rate": {
-                "max": 0
-                }
-           }
+      "create_volume_params": {},
+      "availability_zone": "{{availability_zone}}"
+    },
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "context": {
+      "users": {
+        "tenants": {{users}},
+        "users_per_tenant": {{tenants}}
+      },
+      "api_versions@openstack": { "cinder": {"service_type": "volumev3"} },
+      "quotas": {
+        "nova": {
+          "instances": -1,
+          "cores": -1,
+          "ram": -1,
+          "key_pairs": -1,
+          "security_groups": -1,
+          "security_group_rules": -1
+        },
+        "cinder": { "volumes": -1 }
+      }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ],
+  "CinderVolumes.create_and_delete_snapshot": [
+  {
+    "args": { "force": false },
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "context": {
+      "users": {
+        "tenants": {{users}},
+        "users_per_tenant": {{tenants}}
+      },
+      "volumes": { "size": {{volume_size}} },
+      "quotas": {
+        "cinder": {
+          "snapshots": -1,
+          "volumes": -1
         }
-    ],
-    "CinderVolumes.create_and_delete_snapshot": [
-        {
-            "args": {
-                "force": false
-            },
-            "runner": {
-                "type": "constant",
-                "concurrency": {{concurrency}},
-                "times": {{times}}
-            },
-            "context": {
-                "users": {
-                    "tenants": {{users}},
-                    "users_per_tenant": {{tenants}}
-                },
-                "volumes": {
-                    "size": {{volume_size}}
-                },
-                "quotas": {
-                        "cinder": {
-                                "snapshots": -1,
-                                "volumes": -1
-                                }
-                },
-            "api_versions@openstack":
-            {
-                "cinder": {"service_type": "volumev3"}
-            }
-            },
-           "sla": {
-                "failure_rate": {
-                "max": 0
-                }
-           }
+      },
+      "api_versions@openstack": { "cinder": {"service_type": "volumev3"} }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ],
+  "CinderVolumes.create_and_upload_volume_to_image": [
+  {
+    "args": {
+      "size": {{volume_size}},
+      "force": false,
+      "container_format": "bare",
+      "disk_format": "raw",
+      "do_delete": true,
+      "image": {
+        "name": "{{image_name}}"
+      }
+    },
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "context": {
+      "users": {
+        "tenants": {{users}},
+        "users_per_tenant": {{tenants}}
+      },
+      "quotas": {
+        "cinder": {
+          "snapshots": -1,
+          "volumes": -1
         }
-     ],
-    "CinderVolumes.create_and_upload_volume_to_image": [
-        {
-            "args": {
-                "size": {{volume_size}},
-                "force": false,
-                "container_format": "bare",
-                "disk_format": "raw",
-                "do_delete": true,
-                "image": {
-                    "name": "{{image_name}}"
-                }
-            },
-            "runner": {
-                "type": "constant",
-                "concurrency": {{concurrency}},
-                "times": {{times}}
-            },
-            "context": {
-                "users": {
-                    "tenants": {{users}},
-                    "users_per_tenant": {{tenants}}
-                },
-                "quotas": {
-                        "cinder": {
-                                "snapshots": -1,
-                                "volumes": -1
-                                }
-                },
-                "api_versions@openstack":
-                {
-                "cinder": {"service_type": "volumev3"}
-                }
-            },
-           "sla": {
-                "failure_rate": {
-                "max": 0
-                }
-           }
-        }
-      ],
-    "GlanceImages.create_and_delete_image": [
-        {
-            "args": {
-                "image_location": "{{rbd_image}}",
-                "container_format": "bare",
-                "disk_format": "qcow2"
-            },
-            "runner": {
-                "type": "constant",
-                "concurrency": {{concurrency}},
-                "times": {{times}}
-            },
-            "context": {
-                "users": {
-                    "tenants": {{users}},
-                    "users_per_tenant": {{tenants}}
-                }
-            },
-           "sla": {
-                "failure_rate": {
-                "max": 0
-                }
-           }
-        }
-     ],
-    "HeatStacks.create_and_delete_stack": [
-        {
-            "args": {
-               "template_path": "{{heat_template}}"
-            },
-            "runner": {
-                "type": "constant",
-                "concurrency": {{concurrency}},
-                "times": {{times}}
-            },
-            "context": {
-                "users": {
-                    "tenants": {{users}},
-                    "users_per_tenant": {{tenants}}
-                }
-            },
-           "sla": {
-                "failure_rate": {
-                "max": 0
-                }
-           }
-        }
-      ],
-    "KeystoneBasic.create_tenant_with_users": [
-        {
-            "args": {
-                "users_per_tenant": 10
-            },
-            "runner": {
-                "type": "constant",
-                "concurrency": {{concurrency}},
-                "times": {{times}}
-            },
-           "sla": {
-                "failure_rate": {
-                "max": 0
-                }
-           }
-        }
-       ]
+      },
+      "api_versions@openstack": { "cinder": {"service_type": "volumev3"} }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ],
+  "GlanceImages.create_and_delete_image": [
+  {
+    "args": {
+      "image_location": "{{rbd_image}}",
+      "container_format": "bare",
+      "disk_format": "qcow2"
+    },
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "context": {
+      "users": {
+        "tenants": {{users}},
+        "users_per_tenant": {{tenants}}
+      }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ],
+  "HeatStacks.create_and_delete_stack": [
+  {
+    "args": { "template_path": "{{heat_template}}" },
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "context": {
+      "users": {
+        "tenants": {{users}},
+        "users_per_tenant": {{tenants}}
+      }
+    },
+    "sla": { "failure_rate": { "max": 0 } }
+  }
+  ]
 }