Add new vm_availability_zone and use it for virtual environments

Change-Id: I4ee0abef632fdec03a6a673d28e23142e3e65861
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot
index b018a20..d8c2e9f 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot
@@ -22,6 +22,8 @@
     type: string
   foundation_flavor:
     type: string
+  bm_availability_zone:
+    type: string
 
 resources:
   subnets:
@@ -44,6 +46,7 @@
       env_name: { get_param: env_name }
       mcp_version: { get_param: mcp_version }
       cfg01_flavor: { get_param: cfg_flavor }
+      availability_zone: { get_param: bm_availability_zone }
       management_net: 'system-phys-2421'
       control_net: 'system-phys-2422'
       tenant_net: 'system-phys-2423'
@@ -67,6 +70,7 @@
       mcp_version: { get_param: mcp_version }
       instance_domain: {get_param: instance_domain}
       instance_name: foundation
+      availability_zone: { get_param: bm_availability_zone }
       management_net: 'system-phys-2421'
       control_net: 'system-phys-2422'
       tenant_net: 'system-phys-2423'