Add new vm_availability_zone and use it for virtual environments
Change-Id: I4ee0abef632fdec03a6a673d28e23142e3e65861
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
index e5fe830..9aa42b1 100644
--- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
@@ -70,6 +70,11 @@
foundation_image:
type: string
+ bm_availability_zone:
+ type: string
+ vm_availability_zone:
+ type: string
+
resources:
networks:
type: MCP::Networks
@@ -97,6 +102,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: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -123,6 +129,7 @@
instance02_name: ctl02
instance03_name: ctl03
instance_flavor: {get_param: ctl_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
instance01_control_net_static_ip:
list_join:
@@ -174,6 +181,7 @@
instance02_name: dbs02
instance03_name: dbs03
instance_flavor: {get_param: dbs_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
instance01_control_net_static_ip:
list_join:
@@ -225,6 +233,7 @@
instance02_name: kvm02
instance03_name: kvm03
instance_flavor: {get_param: kvm_fake_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
instance01_control_net_static_ip:
list_join:
@@ -276,6 +285,7 @@
instance02_name: msg02
instance03_name: msg03
instance_flavor: {get_param: msg_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
instance01_control_net_static_ip:
list_join:
@@ -327,6 +337,7 @@
instance02_name: cid02
instance03_name: cid03
instance_flavor: {get_param: cid_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
instance01_control_net_static_ip:
list_join:
@@ -378,6 +389,7 @@
instance02_name: ntw02
instance03_name: ntw03
instance_flavor: {get_param: ntw_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
instance01_control_net_static_ip:
list_join:
@@ -429,6 +441,7 @@
instance02_name: nal02
instance03_name: nal03
instance_flavor: {get_param: nal_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
instance01_control_net_static_ip:
list_join:
@@ -480,6 +493,7 @@
instance02_name: mon02
instance03_name: mon03
instance_flavor: {get_param: mon_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
instance01_control_net_static_ip:
list_join:
@@ -531,6 +545,7 @@
instance02_name: log02
instance03_name: log03
instance_flavor: {get_param: log_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
instance01_control_net_static_ip:
list_join:
@@ -582,6 +597,7 @@
instance02_name: mtr02
instance03_name: mtr03
instance_flavor: {get_param: mtr_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
instance01_control_net_static_ip:
list_join:
@@ -633,6 +649,7 @@
instance02_name: cmn02
instance03_name: cmn03
instance_flavor: {get_param: cmn_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
instance01_control_net_static_ip:
list_join:
@@ -683,6 +700,7 @@
instance02_name: rgw02
instance03_name: rgw03
instance_flavor: {get_param: rgw_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
instance01_control_net_static_ip:
list_join:
@@ -733,6 +751,7 @@
instance02_name: osd002
instance03_name: osd003
instance_flavor: {get_param: osd_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
instance01_control_net_static_ip:
list_join:
@@ -782,6 +801,7 @@
instance_domain: {get_param: instance_domain}
instance_name: prx01
instance_flavor: {get_param: prx_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
control_net_static_ip:
list_join:
@@ -807,6 +827,7 @@
instance_domain: {get_param: instance_domain}
instance_name: prx02
instance_flavor: {get_param: prx_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
control_net_static_ip:
list_join:
@@ -831,6 +852,7 @@
instance_domain: {get_param: instance_domain}
instance_name: cmp001
instance_flavor: {get_param: cmp_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
control_net_static_ip:
list_join:
@@ -856,6 +878,7 @@
instance_domain: {get_param: instance_domain}
instance_name: cmp002
instance_flavor: {get_param: cmp_flavor}
+ availability_zone: { get_param: vm_availability_zone }
underlay_userdata: { get_file: ./underlay-userdata.yaml }
control_net_static_ip:
list_join:
@@ -882,6 +905,7 @@
instance_name: foundation
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
+ availability_zone: { get_param: bm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -914,6 +938,7 @@
instance_domain: {get_param: instance_domain}
instance_name: vsrx
instance_flavor: {get_param: vsrx_flavor}
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }