From 7e99dc00a43bb1321d342c0cdf87e0e18133f268 Mon Sep 17 00:00:00 2001 From: kesper Date: Mon, 19 Jun 2017 11:29:56 +0000 Subject: [PATCH] Added a condition for 'ilo' hardware type Added a condition to not to use deploy iso when boot interface 'ilo-virtual-media' is not enabled. Change-Id: I97e20f4723967ee14de0d41d6b99149f12f4d2f1 --- devstack/lib/ironic | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index be02c56bc2..f968cd6c8f 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -1708,7 +1708,8 @@ function enroll_nodes { elif is_deployed_by_ilo; then node_options+=" -i ilo_address=$bmc_address -i ilo_password=$bmc_passwd\ -i ilo_username=$bmc_username" - if [[ $IRONIC_DEPLOY_DRIVER != "pxe_ilo" ]]; then + if [[ $IRONIC_DEPLOY_DRIVER != "pxe_ilo" && \ + $IRONIC_ENABLED_BOOT_INTERFACES == *"ilo-virtual-media"* ]]; then node_options+=" -i ilo_deploy_iso=$IRONIC_DEPLOY_ISO_ID" fi elif is_deployed_by_drac; then