openstack/ironic
Code Issues Proposed changes

DevStack: Tiny changes following iRMC classic driver removal

Browse Source 
This patch includes small changes to complement the removal of iRMC
classic drivers for consistency between irmc hardware type and other
hardware types.

Change-Id: I84dac94f1340e239796ea3da7a5fbd9154813795
This commit is contained in:
Hironori Shiina 2018-06-28 10:26:16 +09:00
parent 1a07137118
commit bd003c69be
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/lib/ironic
View File

@ -116,7 +116,7 @@ IRONIC_HW_ARCH=${IRONIC_HW_ARCH:-x86_64}
# idrac:
# <BMC address> <MAC address> <BMC username> <BMC password>
#
# * irmc:
# irmc:
# <BMC address> <MAC address> <BMC username> <BMC password>
#
IRONIC_HWINFO_FILE=${IRONIC_HWINFO_FILE:-$IRONIC_DATA_DIR/hardware_info}
@ -285,7 +285,8 @@ fi
# are ``ipmi``, ``snmp`` and ``redfish``.
#
# Additional valid choices if IRONIC_IS_HARDWARE == true are:
# ``cisco-ucs-managed``, ``cisco-ucs-standalone``, ``oneview`` and ``idrac``.
# ``cisco-ucs-managed``, ``cisco-ucs-standalone``, ``oneview``, ``idrac``,
# and ``irmc``.
IRONIC_DEPLOY_DRIVER=${IRONIC_DEPLOY_DRIVER:-ipmi}
# If the requested driver is not yet enable, enable it, if it is not it will fail anyway
@ -647,7 +648,7 @@ function is_deployed_by_redfish {
}
function is_deployed_by_irmc {
[[ -z "${IRONIC_DEPLOY_DRIVER##*irmc}" ]] && return 0
[[ "$IRONIC_DEPLOY_DRIVER" == irmc ]] && return 0
return 1
}