openstack
/
ironic
Code Issues Proposed changes

Merge "Added a condition for 'ilo' hardware type"

This commit is contained in:
Jenkins 2017-07-30 14:34:19 +00:00 committed by Gerrit Code Review
parent 0c07c52211 7e99dc00a4
commit 84aacc86ea
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/lib/ironic
View File

@ -1730,7 +1730,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