From bd003c69bedc2bfa2d4598d2448c366422023def Mon Sep 17 00:00:00 2001
From: Hironori Shiina <shiina.hironori@jp.fujitsu.com>
Date: Thu, 28 Jun 2018 10:26:16 +0900
Subject: [PATCH] DevStack: Tiny changes following iRMC classic driver removal
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
---
devstack/lib/ironic | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index f58f34b504..ca5e0e70e8 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -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
}