Unhardcode AZ
Related-Prod: PRODX-3456
Change-Id: I219229c61dcc887e3cd59ffdc256cb29067a68f5
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index cbcd538..10c1c6b 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -335,6 +335,9 @@
Number of extra volumes for OSD instance
type: number
default: 0
+ availability_zone:
+ type: string
+ default: nova
conditions:
aio_deploy:
@@ -431,6 +434,7 @@
functions_override: { get_param: functions_override }
hardware_metadata: { get_param: hardware_metadata}
single_node: { get_param: single_node}
+ availability_zone: { get_param: availability_zone }
masters:
type: OS::Heat::ResourceGroup
@@ -462,6 +466,7 @@
ucp_master_host: { get_attr: [ucp, server_private_ip] }
functions_override: { get_param: functions_override }
hardware_metadata: { get_param: hardware_metadata}
+ availability_zone: { get_param: availability_zone }
workers:
type: OS::Heat::ResourceGroup
@@ -511,6 +516,7 @@
hardware_metadata: { get_param: hardware_metadata}
lvm_loop_device_size: { get_param: cmp_lvm_loop_device_size }
cinder_lvm_loop_device_size: { get_param: cmp_cinder_lvm_loop_device_size }
+ availability_zone: { get_param: availability_zone }
cmps:
type: OS::Heat::ResourceGroup
@@ -560,6 +566,7 @@
hardware_metadata: { get_param: hardware_metadata}
lvm_loop_device_size: { get_param: cmp_lvm_loop_device_size }
cinder_lvm_loop_device_size: { get_param: cmp_cinder_lvm_loop_device_size }
+ availability_zone: { get_param: availability_zone }
acmps:
type: OS::Heat::ResourceGroup
@@ -610,6 +617,7 @@
huge_pages: { get_param: huge_pages }
lvm_loop_device_size: { get_param: acmp_lvm_loop_device_size }
cinder_lvm_loop_device_size: { get_param: acmp_cinder_lvm_loop_device_size }
+ availability_zone: { get_param: availability_zone }
gtws:
type: OS::Heat::ResourceGroup
@@ -650,6 +658,7 @@
ironic_baremetal_tunnel_cidr: { get_param: ironic_baremetal_tunnel_cidr }
ironic_mt_enabled: { get_param: ironic_mt_enabled }
hardware_metadata: { get_param: hardware_metadata}
+ availability_zone: { get_param: availability_zone }
lmas:
type: OS::Heat::ResourceGroup
@@ -690,6 +699,7 @@
ironic_baremetal_tunnel_cidr: { get_param: ironic_baremetal_tunnel_cidr }
ironic_mt_enabled: { get_param: ironic_mt_enabled }
hardware_metadata: { get_param: hardware_metadata}
+ availability_zone: { get_param: availability_zone }
osds:
type: OS::Heat::ResourceGroup
@@ -738,6 +748,7 @@
tun_subnet_id: { get_attr: [tun_network, tun_subnet_id] }
hardware_metadata: { get_param: hardware_metadata}
num_volumes: { get_param: volumes_per_osd_instance }
+ availability_zone: { get_param: availability_zone }
frrs: # spares for osds/cmps
type: OS::Heat::ResourceGroup
@@ -786,6 +797,7 @@
tun_subnet_id: { get_attr: [tun_network, tun_subnet_id] }
hardware_metadata: { get_param: hardware_metadata}
frr_bgp_neighbors: { list_join: [',', {get_attr: [workers, server_tun_ip]}] }
+ availability_zone: { get_param: availability_zone }
spares: # spares for osds/cmps
type: OS::Heat::ResourceGroup
@@ -833,6 +845,7 @@
tun_network: { get_attr: [tun_network, tun_network_id] }
tun_subnet_id: { get_attr: [tun_network, tun_subnet_id] }
hardware_metadata: { get_param: hardware_metadata}
+ availability_zone: { get_param: availability_zone }
ntws:
type: OS::Heat::ResourceGroup
@@ -880,6 +893,7 @@
tun_network: { get_attr: [tun_network, tun_network_id] }
tun_subnet_id: { get_attr: [tun_network, tun_subnet_id] }
hardware_metadata: { get_param: hardware_metadata}
+ availability_zone: { get_param: availability_zone }
vbmcs:
type: OS::Heat::ResourceGroup
@@ -920,6 +934,7 @@
ironic_baremetal_tunnel_cidr: { get_param: ironic_baremetal_tunnel_cidr }
ironic_mt_enabled: { get_param: ironic_mt_enabled }
hardware_metadata: { get_param: hardware_metadata}
+ availability_zone: { get_param: availability_zone }
outputs:
ucp_ips: