Add an ability pass interface info via metadata
The patch adds an ability to pass interface information including
pci_info, MAC and IP addresses via metadata in wait condition
response.
Related-PRODX: PRODX-9016
Change-Id: I984ecd8630706179ec6fae6dcf1867f4def708a8
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index eb4ebf5..e6c70d3 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -150,16 +150,16 @@
tungstenfabric_enabled:
type: boolean
default: false
- tf_data_network_cidr:
+ tun_network_cidr:
type: string
default: '10.15.0.0/24'
- tf_data_network_pool_start:
+ tun_network_pool_start:
type: string
default: '10.15.0.2'
- tf_data_network_pool_end:
+ tun_network_pool_end:
type: string
default: '10.15.0.99'
- tf_data_network_interface:
+ tun_network_interface:
type: string
default: 'ens8'
description: 'The name of interface that should be used by vrouter in deployment with TF'
@@ -262,10 +262,6 @@
default: '0,0'
type: string
-conditions:
- create_tf_data_network_res:
- get_param: tungstenfabric_enabled
-
resources:
key_pair:
type: OS::Nova::KeyPair
@@ -280,13 +276,12 @@
public_net_id: { get_param: public_net_id }
control_network_cidr: { get_param: control_network_cidr }
- tf_data_network:
- type: MCP2::NetworkTFData
- condition: create_tf_data_network_res
+ tun_network:
+ type: MCP2::NetworkTun
properties:
- tf_data_network_cidr: { get_param: tf_data_network_cidr }
- tf_data_network_pool_start: { get_param: tf_data_network_pool_start }
- tf_data_network_pool_end: { get_param: tf_data_network_pool_end }
+ tun_network_cidr: { get_param: tun_network_cidr }
+ tun_network_pool_start: { get_param: tun_network_pool_start }
+ tun_network_pool_end: { get_param: tun_network_pool_end }
private_floating_network:
type: MCP2::NetworkPrvFl
@@ -298,7 +293,7 @@
control_network_vsrx_peering_ip: {get_param: control_network_vsrx_peering_ip}
accessible_network: { get_attr: [accessible_network, public_network]}
data_network_vsrx_ip: { get_param: data_network_vsrx_ip }
- tf_data_network: {if: ["create_tf_data_network_res", { get_attr: [tf_data_network, tf_data_network_id] }, ""]}
+ tun_network: { get_attr: [tun_network, tun_network_id] }
storage_network:
type: MCP2::NetworkAccStorage
@@ -410,8 +405,8 @@
ironic_baremetal_tunnel_cidr: { get_param: ironic_baremetal_tunnel_cidr }
ironic_mt_enabled: { get_param: ironic_mt_enabled }
tungstenfabric_enabled: { get_param: tungstenfabric_enabled }
- tf_data_network: {if: ["create_tf_data_network_res", { get_attr: [tf_data_network, tf_data_network_id] }, ""]}
- tf_data_subnet_id: {if: ["create_tf_data_network_res", { get_attr: [tf_data_network, tf_data_subnet_id] }, ""]}
+ 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}
cmps:
@@ -455,8 +450,8 @@
ironic_baremetal_tunnel_cidr: { get_param: ironic_baremetal_tunnel_cidr }
ironic_mt_enabled: { get_param: ironic_mt_enabled }
tungstenfabric_enabled: { get_param: tungstenfabric_enabled }
- tf_data_network: {if: ["create_tf_data_network_res", { get_attr: [tf_data_network, tf_data_network_id] }, ""]}
- tf_data_subnet_id: {if: ["create_tf_data_network_res", { get_attr: [tf_data_network, tf_data_subnet_id] }, ""]}
+ 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}
acmps:
@@ -500,8 +495,8 @@
ironic_baremetal_tunnel_cidr: { get_param: ironic_baremetal_tunnel_cidr }
ironic_mt_enabled: { get_param: ironic_mt_enabled }
tungstenfabric_enabled: { get_param: tungstenfabric_enabled }
- tf_data_network: {if: ["create_tf_data_network_res", { get_attr: [tf_data_network, tf_data_network_id] }, ""]}
- tf_data_subnet_id: {if: ["create_tf_data_network_res", { get_attr: [tf_data_network, tf_data_subnet_id] }, ""]}
+ 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}
huge_pages: { get_param: huge_pages }
@@ -622,8 +617,8 @@
ironic_baremetal_tunnel_cidr: { get_param: ironic_baremetal_tunnel_cidr }
ironic_mt_enabled: { get_param: ironic_mt_enabled }
tungstenfabric_enabled: { get_param: tungstenfabric_enabled }
- tf_data_network: {if: ["create_tf_data_network_res", { get_attr: [tf_data_network, tf_data_network_id] }, ""]}
- tf_data_subnet_id: {if: ["create_tf_data_network_res", { get_attr: [tf_data_network, tf_data_subnet_id] }, ""]}
+ 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}
spares: # spares for osds/cmps
@@ -667,8 +662,8 @@
ironic_baremetal_tunnel_cidr: { get_param: ironic_baremetal_tunnel_cidr }
ironic_mt_enabled: { get_param: ironic_mt_enabled }
tungstenfabric_enabled: { get_param: tungstenfabric_enabled }
- tf_data_network: {if: ["create_tf_data_network_res", { get_attr: [tf_data_network, tf_data_network_id] }, ""]}
- tf_data_subnet_id: {if: ["create_tf_data_network_res", { get_attr: [tf_data_network, tf_data_subnet_id] }, ""]}
+ 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}
ntws: