diff --git a/configure.sh b/configure.sh
index dec0679..0f48d8f 100755
--- a/configure.sh
+++ b/configure.sh
@@ -23,6 +23,8 @@
   sub_name=`date "+%H_%M_%S"`
   rally deployment create --fromenv --name=tempest_$sub_name
   rally deployment config
+  echo "[openstack]" >> /etc/rally/rally.conf
+  echo "pre_newton_neutron=True" >> /etc/rally/rally.conf
 }
 
 tempest_configuration () {
@@ -77,18 +79,26 @@
 #shared fixed network
 shared_count=`neutron net-list -c name -c shared | grep True | wc -l`
 if [ $shared_count -gt 1 ]; then
-  echo "TOO MANY SHARED NETWORKS! Script will choose just 1 random"
+  echo "TOO MANY SHARED NETWORKS! Script will choose first net in list with fixed-net name"
 fi
 if [ $shared_count -eq 0 ]; then
   echo "Let's create shared fixed net"
   neutron net-create --shared fixed-net
   neutron subnet-create --name fixed-subnet --gateway 192.168.0.1 --allocation-pool start=192.168.0.2,end=192.168.0.254 --ip-version 4 fixed-net 192.168.0.0/24
 fi
-FIXED_NET=$(neutron net-list -c name -c shared | grep True | awk '{print $2}' | tail -n 1)
-echo "Fixed net is: $FIXED_NET"
-#Updating of tempest_full.conf file is skipped/deprecated
+FIXED_NET=$(neutron net-list -c name -c shared | grep "fixed-net" | grep True | awk '{print $2}' | tail -n 1)
+FIXED_NET_ID=$(neutron net-list -c id -c name -c shared | grep "fixed-net" | grep True | awk '{print $2}' | tail -n 1)
+FIXED_SUBNET_ID=$(neutron net-show $FIXED_NET_ID -c subnets | grep subnets | awk '{print $4}')
+FIXED_SUBNET_NAME=$(neutron subnet-show -c name $FIXED_SUBNET_ID | grep name | awk '{print $4}')
+echo "Fixed net name is $FIXED_NET, id is $FIXED_NET_ID"
+echo "Fixed subnet is: $FIXED_SUBNET_ID, name: $FIXED_SUBNET_NAME"
 sed -i 's/${IMAGE_REF2}/'$IMAGE_REF2'/g' $current_path/cvp-configuration/tempest/tempest_ext.conf
+sed -i 's/${FIXED_NET}/'$FIXED_NET_ID'/g' $current_path/cvp-configuration/rally/rally_scenarios.json
+sed -i 's/${FIXED_NET}/'$FIXED_NET_ID'/g' $current_path/cvp-configuration/rally/rally_scenarios_100.json
+sed -i 's/${FIXED_NET}/'$FIXED_NET_ID'/g' $current_path/cvp-configuration/rally/rally_scenarios_fip_and_ubuntu.json
+sed -i 's/${FIXED_NET}/'$FIXED_NET_ID'/g' $current_path/cvp-configuration/rally/rally_scenarios_fip_and_ubuntu_100.json
 sed -i 's/${FIXED_NET}/'$FIXED_NET'/g' $current_path/cvp-configuration/tempest/tempest_ext.conf
+sed -i 's/${FIXED_SUBNET_NAME}/'$FIXED_SUBNET_NAME'/g' $current_path/cvp-configuration/tempest/tempest_ext.conf
 sed -i 's/${OS_USERNAME}/'$OS_USERNAME'/g' $current_path/cvp-configuration/tempest/tempest_ext.conf
 sed -i 's/${OS_TENANT_NAME}/'$OS_TENANT_NAME'/g' $current_path/cvp-configuration/tempest/tempest_ext.conf
 sed -i 's/${OS_REGION_NAME}/'$OS_REGION_NAME'/g' $current_path/cvp-configuration/tempest/tempest_ext.conf
@@ -98,6 +108,7 @@
 #supress tempest.conf display in console
 #cat $current_path/cvp-configuration/tempest/tempest_ext.conf
 cp $current_path/cvp-configuration/tempest/boot_config_none_env.yaml /home/rally/boot_config_none_env.yaml
+cp $current_path/cvp-configuration/cleanup.sh /home/rally/cleanup.sh
 }
 
 if [ "$1" == "reconfigure" ]; then
@@ -110,13 +121,13 @@
 
 check_variables
 rally_configuration
+quick_configuration
 if [ -n "${TEMPEST_REPO}" ]; then
     tempest_configuration
-    quick_configuration
     # If you do not have fip network, use this command
     #cat $current_path/cvp-configuration/tempest/skip-list-fip-only.yaml >> $current_path/cvp-configuration/tempest/skip-list-queens.yaml
     # If Opencontrail is deployed, use this command
-    #cat $current_path/cvp-configuration/tempest/skip-list-oc4.yaml >> $current_path/cvp-configuration/tempest/skip-list-queens.yaml
+    cat $current_path/cvp-configuration/tempest/skip-list-oc4.yaml >> $current_path/cvp-configuration/tempest/skip-list-queens.yaml
     cat $current_path/cvp-configuration/tempest/skip-list-heat.yaml >> $current_path/cvp-configuration/tempest/skip-list-queens.yaml
     rally verify configure-verifier --extend $current_path/cvp-configuration/tempest/tempest_ext.conf
     rally verify configure-verifier --show
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 } }
+  }
+  ]
 }
diff --git a/rally/rally_scenarios_100.json b/rally/rally_scenarios_100.json
new file mode 100644
index 0000000..d522bdd
--- /dev/null
+++ b/rally/rally_scenarios_100.json
@@ -0,0 +1,494 @@
+{% set flavor_name = flavor_name or "m1.tiny" %}
+{% set image_name = image_name or "testvm" %}
+{% set volume_type = volume_type or "default" %}
+{% set availability_zone = "nova" %}
+{% set concurrency = 10 %}
+{% set volume_size = 1 %}
+{% set times = 100 %}
+{% set users = 3 %}
+{% set tenants = 3 %}
+{% 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 } }
+  }
+  ],
+  "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}}
+      },
+      "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 } }
+  }
+  ],
+  "NovaServers.boot_and_migrate_server": [
+  {
+    "args": {
+      "flavor": {
+        "name": "{{flavor_name}}"
+      },
+      "image": {
+        "name": "{{image_name}}"
+      },
+      "nics": [
+        {"net-id": "{{fixed_net}}"}
+      ]
+    },
+    "runner": {
+      "type": "constant",
+      "times": {{times}},
+      "concurrency": {{concurrency}}
+    },
+    "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_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}}"
+      },
+      "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
+        },
+        "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_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
+        }
+      }
+    },
+    "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}}"}
+      ],
+      "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
+        }
+      },
+      "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
+        }
+      },
+      "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 } }
+  }
+  ]
+}
diff --git a/rally/rally_scenarios_fip_and_ubuntu.json b/rally/rally_scenarios_fip_and_ubuntu.json
new file mode 100644
index 0000000..7782a3a
--- /dev/null
+++ b/rally/rally_scenarios_fip_and_ubuntu.json
@@ -0,0 +1,136 @@
+{% 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 availability_zone = "nova" %}
+{% set concurrency = 1 %}
+{% set times = 1 %}
+{% set users = 1 %}
+{% set tenants = 1 %}
+{% set ext_net_id = "<PUT_ID_HERE>" %}
+{% set fixed_net = "${FIXED_NET}" %}
+{% set script_file = script_file or "/home/rally/source/cvp-configuration/rally/instance_test.sh" %}
+{
+  "VMTasks.boot_runcommand_delete": [
+  {
+    "args": {
+      "network_create_args": {},
+      "flavor": {
+        "name": "{{flavor_name_ubuntu}}"
+      },
+      "image": {
+        "name": "{{image_name_ubuntu}}"
+      },
+      "nics": [
+        {"net-id": "{{fixed_net}}"}
+      ],
+      "volume_args": { "size": 10 },
+      "router_create_args": {
+        "external_gateway_info": {"network_id": "{{ext_net_id}}"}
+      },
+      "wait_for_ping": false,
+      "force_delete": false,
+      "command": {
+        "interpreter": "/bin/sh",
+        "script_file": "{{script_file}}"
+      },
+      "username": "ubuntu"
+    },
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "context": {
+      "users": {
+        "users_per_tenant": {{users}},
+        "tenants": {{tenants}}
+      },
+      "api_versions@openstack": { "cinder": {"service_type": "volumev3"} }
+    }
+  }
+  ],
+  "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": {
+        "router": {
+          "external_gateway_info": {
+            "network_id": "{{ext_net_id}}"
+          }
+        }
+      },
+      "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 } }
+  }
+  ],
+  "NovaServers.boot_and_delete_server": [
+  {
+    "args": {
+      "flavor": {
+        "name": "{{flavor_name_ubuntu}}"
+      },
+      "image": {
+        "name": "{{image_name_ubuntu}}"
+      },
+      "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 } }
+  }
+  ]
+}
diff --git a/rally/rally_scenarios_fip_and_ubuntu_100.json b/rally/rally_scenarios_fip_and_ubuntu_100.json
new file mode 100644
index 0000000..6c3a05d
--- /dev/null
+++ b/rally/rally_scenarios_fip_and_ubuntu_100.json
@@ -0,0 +1,136 @@
+{% 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 availability_zone = "nova" %}
+{% set concurrency = 10 %}
+{% set times = 100 %}
+{% set users = 3 %}
+{% set tenants = 3 %}
+{% set ext_net_id = "<PUT_ID_HERE>" %}
+{% set fixed_net = "${FIXED_NET}" %}
+{% set script_file = script_file or "/home/rally/source/cvp-configuration/rally/instance_test.sh" %}
+{
+  "VMTasks.boot_runcommand_delete": [
+  {
+    "args": {
+      "network_create_args": {},
+      "flavor": {
+        "name": "{{flavor_name_ubuntu}}"
+      },
+      "image": {
+        "name": "{{image_name_ubuntu}}"
+      },
+      "nics": [
+        {"net-id": "{{fixed_net}}"}
+      ],
+      "volume_args": { "size": 10 },
+      "router_create_args": {
+        "external_gateway_info": {"network_id": "{{ext_net_id}}"}
+      },
+      "wait_for_ping": false,
+      "force_delete": false,
+      "command": {
+        "interpreter": "/bin/sh",
+        "script_file": "{{script_file}}"
+      },
+      "username": "ubuntu"
+    },
+    "runner": {
+      "type": "constant",
+      "concurrency": {{concurrency}},
+      "times": {{times}}
+    },
+    "context": {
+      "users": {
+        "users_per_tenant": {{users}},
+        "tenants": {{tenants}}
+      },
+      "api_versions@openstack": { "cinder": {"service_type": "volumev3"} }
+    }
+  }
+  ],
+  "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": {
+        "router": {
+          "external_gateway_info": {
+            "network_id": "{{ext_net_id}}"
+          }
+        }
+      },
+      "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 } }
+  }
+  ],
+  "NovaServers.boot_and_delete_server": [
+  {
+    "args": {
+      "flavor": {
+        "name": "{{flavor_name_ubuntu}}"
+      },
+      "image": {
+        "name": "{{image_name_ubuntu}}"
+      },
+      "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 } }
+  }
+  ]
+}
diff --git a/rally/rally_scenarios_full.json b/rally/rally_scenarios_full.json
deleted file mode 100644
index 4097c7c..0000000
--- a/rally/rally_scenarios_full.json
+++ /dev/null
@@ -1,705 +0,0 @@
-{% 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 = 10 %}
-{% set volume_size = 1 %}
-{% set times = 100 %}
-{% set users = 3 %}
-{% set tenants = 3 %}
-{% 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" %}
-{
-"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
-        }
-      }
-    }
-  ],
-  "NovaServers.boot_and_delete_server": [
-    {
-      "args": {
-        "flavor": {
-          "name": "{{flavor_name_ubuntu}}"
-        },
-      "image": {
-        "name": "{{image_name_ubuntu}}"
-      },
-      "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
-          }
-      }
-    },
-    {
-      "args": {
-        "flavor": {
-          "name": "{{flavor_name}}"
-        },
-      "image": {
-        "name": "{{image_name}}"
-      },
-      "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
-          }
-      }
-    }
-  ],
-  "NovaServers.boot_server_from_volume_and_delete": [
-    {
-      "args": {
-        "flavor": {
-          "name": "{{flavor_name}}"
-        },
-        "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
-        }
-      }
-    }
-  ],
-    "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_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
-                }
-           }
-        }
-      ],
-    "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
-                }
-           }
-        }
-    ],
-    "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
-                }
-           }
-        }
-     ],
-    "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
-                }
-           }
-        }
-       ]
-}
diff --git a/rally/rally_scenarios_keystone_stress.json b/rally/rally_scenarios_keystone_stress.json
new file mode 100644
index 0000000..e30146c
--- /dev/null
+++ b/rally/rally_scenarios_keystone_stress.json
@@ -0,0 +1,408 @@
+{% set concurrency = 10 %}
+{% set ops_times = 100 %}
+{% set validate_times = 1000 %}
+{% set users = 5 %}
+{% set tenants = 10 %}
+
+{% set rps_tiny = 10 %}
+{% set rps_xsmall = 15 %}
+{% set rps_small = 20 %}
+{% set rps_medium = 25 %}
+{% set rps_high = 30 %}
+{% set rps_xhigh = 35 %}
+{% set rps_huge = 40 %}
+
+{% set rps_times = 30000 %}
+
+{
+  "Authenticate.validate_cinder": [
+    {
+      "args": {
+        "repetitions": 2
+      },
+      "runner": {
+        "type": "constant",
+        "times": {{validate_times}},
+        "concurrency": {{concurrency}}
+      },
+      "context": {
+        "users": {
+          "users_per_tenant": {{users}},
+          "tenants": {{tenants}}
+        },
+        "api_versions": {
+          "cinder": {
+            "version": 2,
+            "service_name": "cinderv2",
+  #         "service_type": "volumev2"
+          }
+        }
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    }
+  ],
+  "Authenticate.validate_glance": [
+    {
+      "args": {
+        "repetitions": 2
+      },
+      "runner": {
+        "type": "constant",
+        "times": {{validate_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": {{validate_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": {{validate_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": {{validate_times}},
+        "concurrency": {{concurrency}}
+      },
+      "context": {
+        "users": {
+          "users_per_tenant": {{users}},
+          "tenants": {{tenants}}
+        }
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    }
+  ],
+  "KeystoneBasic.authenticate_user_and_validate_token": [
+    {
+      "args": {},
+      "context": {
+        "users": {
+          "tenants": {{ tenants }},
+          "users_per_tenant": {{users}}
+        }
+      },
+      "runner": {
+        "type": "rps",
+        "rps": {{rps_tiny}},
+        "times": {{rps_times}}
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    },
+    {
+      "args": {},
+      "context": {
+        "users": {
+          "tenants": {{ tenants }},
+          "users_per_tenant": {{users}}
+        }
+      },
+      "runner": {
+        "type": "rps",
+        "rps": {{rps_xsmall}},
+        "times": {{rps_times}}
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    },
+    {
+      "args": {},
+      "context": {
+        "users": {
+          "tenants": {{ tenants }},
+          "users_per_tenant": {{users}}
+        }
+      },
+      "runner": {
+        "type": "rps",
+        "rps": {{rps_small}},
+        "times": {{rps_times}}
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    },
+    {
+      "args": {},
+      "context": {
+        "users": {
+          "tenants": {{ tenants }},
+          "users_per_tenant": {{users}}
+        }
+      },
+      "runner": {
+        "type": "rps",
+        "rps": {{rps_medium}},
+        "times": {{rps_times}}
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    },
+    {
+      "args": {},
+      "context": {
+        "users": {
+          "tenants": {{ tenants }},
+          "users_per_tenant": {{users}}
+        }
+      },
+      "runner": {
+        "type": "rps",
+        "rps": {{rps_high}},
+        "times": {{rps_times}}
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    },
+    {
+      "args": {},
+      "context": {
+        "users": {
+          "tenants": {{ tenants }},
+          "users_per_tenant": {{users}}
+        }
+      },
+      "runner": {
+        "type": "rps",
+        "rps": {{rps_xhigh}},
+        "times": {{rps_times}}
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    },
+    {
+      "args": {},
+      "context": {
+        "users": {
+          "tenants": {{ tenants }},
+          "users_per_tenant": {{users}}
+        }
+      },
+      "runner": {
+        "type": "rps",
+        "rps": {{rps_huge}},
+        "times": {{rps_times}}
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    }
+  ],
+  "KeystoneBasic.add_and_remove_user_role": [
+  {
+      "runner": {
+        "type": "constant",
+        "times": {{ops_times}},
+        "concurrency": {{concurrency}}
+      },
+      "context": {
+        "users": {
+          "tenants": {{tenants}},
+          "users_per_tenant": {{users}}
+        }
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    }
+  ],
+  "KeystoneBasic.create_tenant_with_users": [
+    {
+      "args": {
+        "users_per_tenant": 10
+      },
+      "runner": {
+        "type": "constant",
+        "concurrency": {{concurrency}},
+        "times": {{ops_times}}
+      },
+       "sla": {
+        "failure_rate": {
+        "max": 0
+        }
+       }
+    }
+     ],
+  "KeystoneBasic.create_add_and_list_user_roles": [
+  {
+      "runner": {
+        "type": "constant",
+        "times": {{ops_times}},
+        "concurrency": {{concurrency}}
+      },
+      "context": {
+        "users": {
+          "tenants": {{tenants}},
+          "users_per_tenant": {{users}}
+        }
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    }
+  ],
+  "KeystoneBasic.create_and_delete_role": [
+  {
+      "runner": {
+        "type": "constant",
+        "times": {{ops_times}},
+        "concurrency": {{concurrency}}
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    }
+  ],
+  "KeystoneBasic.create_and_delete_service": [
+  {
+      "args": {
+        "service_type": "Rally_test_type",
+        "description": "test_description"
+      },
+      "runner": {
+        "type": "constant",
+        "times": {{ops_times}},
+        "concurrency": {{concurrency}}
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    }
+  ],
+  "KeystoneBasic.create_and_list_users": [
+    {
+      "args": {},
+      "runner": {
+        "type": "constant",
+        "times": {{ops_times}},
+        "concurrency": {{concurrency}}
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    }
+  ],
+  "KeystoneBasic.create_update_and_delete_tenant": [
+  {
+      "args": {},
+      "runner": {
+        "type": "constant",
+        "times": {{ops_times}},
+        "concurrency": {{concurrency}}
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    }
+  ],
+  "KeystoneBasic.get_entities": [
+  {
+      "runner": {
+        "type": "constant",
+        "times": {{ops_times}},
+        "concurrency": {{concurrency}}
+      },
+      "sla": {
+        "failure_rate": {
+          "max": 0
+        }
+      }
+    }
+  ]
+}
diff --git a/tempest/tempest_ext.conf b/tempest/tempest_ext.conf
index 84bc6e2..d4777f2 100644
--- a/tempest/tempest_ext.conf
+++ b/tempest/tempest_ext.conf
@@ -28,7 +28,7 @@
 minimal_instance_type = m1.tiny
 network_for_ssh = net_name
 floating_network_name = net_name
-fixed_subnet_name = fixed-subnet
+fixed_subnet_name = ${FIXED_SUBNET_NAME}
 disable_ssl_certificate_validation = True
 image_ref = ${IMAGE_REF2}
 minimal_image_ref = ${IMAGE_REF2}