[CVP] Revise skip lists and heat related things

Related-PROD: PROD-30787
Related-PROD: PROD-31357
Change-Id: I9cd5e0a4ae7a7c2a3d08ec3472f1c15829e98ab4
diff --git a/rally/rally_scenarios_fip_and_ubuntu.json b/rally/rally_scenarios_fip_and_ubuntu.json
index 7782a3a..955c6f0 100644
--- a/rally/rally_scenarios_fip_and_ubuntu.json
+++ b/rally/rally_scenarios_fip_and_ubuntu.json
@@ -7,9 +7,10 @@
 {% set times = 1 %}
 {% set users = 1 %}
 {% set tenants = 1 %}
-{% set ext_net_id = "<PUT_ID_HERE>" %}
+{% set ext_net_id = "EXT_NET_ID" %}
 {% set fixed_net = "${FIXED_NET}" %}
-{% set script_file = script_file or "/home/rally/source/cvp-configuration/rally/instance_test.sh" %}
+{% set script_file = script_file or "/home/rally/instance_test.sh" %}
+{% set block_migration = false %}
 {
   "VMTasks.boot_runcommand_delete": [
   {
@@ -132,5 +133,43 @@
     },
     "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 } }
+  }
   ]
 }