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/fragments/SrvInstancesVMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
index 1af557e..4e15338 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
@@ -58,9 +58,9 @@
type: boolean
tungstenfabric_enabled:
type: boolean
- tf_data_network:
+ tun_network:
type: string
- tf_data_subnet_id:
+ tun_subnet_id:
type: string
functions_override:
type: string
@@ -98,10 +98,6 @@
default: '0,0'
type: string
-conditions:
- create_tf_data_network_res:
- get_param: tungstenfabric_enabled
-
resources:
software_config:
@@ -166,19 +162,12 @@
key_name: { get_param: key_name }
availability_zone: nova
networks:
- if:
- - "create_tf_data_network_res"
- - - port: { get_resource: accessible_server_port }
- - port: { get_resource: private_floating_server_port }
- - port: { get_resource: storage_frontend_server_port }
- - port: { get_resource: storage_backend_server_port }
- - port: { get_resource: ironic_baremetal_server_port }
- - port: { get_resource: tf_data_server_port }
- - - port: { get_resource: accessible_server_port }
- - port: { get_resource: private_floating_server_port }
- - port: { get_resource: storage_frontend_server_port }
- - port: { get_resource: storage_backend_server_port }
- - port: { get_resource: ironic_baremetal_server_port }
+ - port: { get_resource: accessible_server_port }
+ - port: { get_resource: private_floating_server_port }
+ - port: { get_resource: storage_frontend_server_port }
+ - port: { get_resource: storage_backend_server_port }
+ - port: { get_resource: ironic_baremetal_server_port }
+ - port: { get_resource: tun_server_port }
user_data_format: SOFTWARE_CONFIG
user_data: { get_resource: install_config_agent}
metadata: { get_param: metadata }
@@ -229,14 +218,13 @@
fixed_ips:
- subnet: { get_param: ironic_baremetal_subnet_id }
- tf_data_server_port:
+ tun_server_port:
type: OS::Neutron::Port
- condition: create_tf_data_network_res
properties:
- network_id: { get_param: tf_data_network }
+ network_id: { get_param: tun_network }
port_security_enabled: false
fixed_ips:
- - subnet: { get_param: tf_data_subnet_id }
+ - subnet: { get_param: tun_subnet_id }
wait_handle:
type: OS::Heat::WaitConditionHandle
@@ -258,8 +246,7 @@
value: { get_attr: [ironic_baremetal_server_port, fixed_ips, 0, ip_address] }
server_tf_data_ip:
description: IP address of server in tf data network
- value: { get_attr: [tf_data_server_port, fixed_ips, 0, ip_address] }
- condition: create_tf_data_network_res
+ value: { get_attr: [tun_server_port, fixed_ips, 0, ip_address] }
server_public_ip:
description: Floating IP address of server in public network
value: { get_attr: [ server_floating_ip, floating_ip_address ] }