openstack
/
ironic
Code Issues Proposed changes

Merge "Install sushy if redfish is a hardware type"

This commit is contained in:
Zuul 2019-08-16 20:43:01 +00:00 committed by Gerrit Code Review
parent 028ab71d3f e9fa1e31ff
commit 617861a076
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/lib/ironic
View File

@ -713,6 +713,11 @@ function is_ansible_deploy_enabled {
return 1
}
function is_redfish_enabled {
[[ -z "${IRONIC_ENABLED_HARDWARE_TYPES%%*redfish*}" ]] && return 0
return 1
}
function is_ansible_with_tinyipa {
# NOTE(pas-ha) we support rebuilding the ramdisk to include (generated) SSH keys
# as needed for ansible deploy interface only for TinyIPA ramdisks for now
@ -1032,7 +1037,7 @@ function install_ironic {
restart_libvirt
fi
if is_deployed_by_redfish; then
if is_redfish_enabled || is_deployed_by_redfish; then
setup_sushy
fi