Remove ironic parameters for BM deployment
Removing ironic parameters for UCP and master nodes in case
of BM deploymnet.
Related-PROD: PRODX-4992
Change-Id: I5b978588f7d5387672e2f44fcacec51395fc509a
diff --git a/de/heat-templates/fragments/SrvInstancesBM.yaml b/de/heat-templates/fragments/SrvInstancesBM.yaml
index b2fe4ad..cdf0647 100644
--- a/de/heat-templates/fragments/SrvInstancesBM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBM.yaml
@@ -30,12 +30,6 @@
type: string
control_network_cidr:
type: string
- ironic_baremetal_network:
- type: string
- ironic_baremetal_subnet_id:
- type: string
- ironic_baremetal_interface:
- type: string
functions_override:
type: string
boot_timeout:
@@ -78,8 +72,6 @@
$private_floating_interface: { get_param: private_floating_interface }
$private_floating_network_cidr: { get_param: private_floating_network_cidr }
$private_floating_interface_ip: { get_attr: [private_floating_server_port, fixed_ips, 0, ip_address] }
- $ironic_baremetal_interface: { get_param: ironic_baremetal_interface }
- $ironic_baremetal_interface_ip: { get_attr: [ironic_baremetal_server_port, fixed_ips, 0, ip_address] }
$functions_override: { get_param: functions_override }
inject_files:
@@ -114,7 +106,6 @@
- network: { get_param: accessible_network }
# NOTE(ohryhorov): connect to accessible network only as ironic doesn't
# support multitenancy use-case. Use private_floating_network for IPAM only.
- # NOTE(vsaienko): ditto about ironic network
user_data_format: SOFTWARE_CONFIG
user_data: { get_resource: install_config_agent}
metadata: { get_param: metadata }
@@ -127,14 +118,6 @@
fixed_ips:
- subnet: { get_param: private_floating_subnet_id }
- ironic_baremetal_server_port:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: ironic_baremetal_network }
- port_security_enabled: false
- fixed_ips:
- - subnet: { get_param: ironic_baremetal_subnet_id }
-
wait_handle:
type: OS::Heat::WaitConditionHandle
wait_condition: