openstack/ironic
Code Issues Proposed changes

Merge "Feat: add ibmc hardware info support for devstack"

Browse Source
This commit is contained in:
Zuul 2020-10-01 13:03:59 +00:00 committed by Gerrit Code Review
commit 33a34ce364
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devstack/lib/ironic
View File

@ -794,11 +794,21 @@ function is_deployed_by_xclarity {
return 1 return 1
} }
function is_deployed_by_ibmc {
[[ "$IRONIC_DEPLOY_DRIVER" == ibmc ]] && return 0
return 1
}
function is_drac_enabled { function is_drac_enabled {
[[ -z "${IRONIC_ENABLED_HARDWARE_TYPES%%*idrac*}" ]] && return 0 [[ -z "${IRONIC_ENABLED_HARDWARE_TYPES%%*idrac*}" ]] && return 0
return 1 return 1
} }
function is_ibmc_enabled {
[[ -z "${IRONIC_ENABLED_HARDWARE_TYPES%%*ibmc*}" ]] && return 0
return 1
}
function is_ansible_deploy_enabled { function is_ansible_deploy_enabled {
[[ -z "${IRONIC_ENABLED_DEPLOY_INTERFACES%%*ansible*}" ]] && return 0 [[ -z "${IRONIC_ENABLED_DEPLOY_INTERFACES%%*ansible*}" ]] && return 0
return 1 return 1
@ -1137,6 +1147,10 @@ function install_ironic {
pip_install python-dracclient pip_install python-dracclient
fi fi
if is_ibmc_enabled; then
pip_install python-ibmcclient
fi
if is_ansible_deploy_enabled; then if is_ansible_deploy_enabled; then
pip_install "$(grep '^ansible' $IRONIC_DIR/driver-requirements.txt | awk '{print $1}')" pip_install "$(grep '^ansible' $IRONIC_DIR/driver-requirements.txt | awk '{print $1}')"
fi fi
@ -2414,6 +2428,11 @@ function enroll_nodes {
--driver-info xclarity_password=$bmc_passwd \ --driver-info xclarity_password=$bmc_passwd \
--driver-info xclarity_username=$bmc_username \ --driver-info xclarity_username=$bmc_username \
--driver-info xclarity_hardware_id=$xclarity_hardware_id" --driver-info xclarity_hardware_id=$xclarity_hardware_id"
elif is_deployed_by_ibmc; then
node_options+=" --driver-info ibmc_address=$bmc_address \
--driver-info ibmc_username=$bmc_username \
--driver-info ibmc_password=$bmc_passwd \
--driver-info ibmc_verify_ca=False"
fi fi
interface_info="${mac_address}" interface_info="${mac_address}"