Skip to content

Commit 8a4dea2

Browse files
committed
Ironic: Update is_ironic_hardware function
The DevStack module of Ironic added a new configuration variable called IRONIC_IS_HARDWARE that can be set to True/False to indicate that we are setting up devstack to deploy physical or virtual machines (see the depends flag). Prior to that, the devstack code assumed that if the driver name loaded is != *_ssh then it's a physical hardware but now we need to kill this assumption because we have means (see the virtualbmc utility) to test drivers such as pxe_ipmitool and agent_ipmitool using virtual machines. Depends-On: I5edc51c7fc8b6f0bb7fe4ca129596709a32eb93e Related-Bug: #1544642 Change-Id: I8b6363bbe280ddd2720c570851bc40e2804a40e2
1 parent 4bcf652 commit 8a4dea2

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

functions-common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ function get_endpoint_url {
994994
# out of tree, as it is used by nova and neutron.
995995
# figure out a way to refactor nova/neutron code to eliminate this
996996
function is_ironic_hardware {
997-
is_service_enabled ironic && [[ -n "${IRONIC_DEPLOY_DRIVER##*_ssh}" ]] && return 0
997+
is_service_enabled ironic && [[ "$IRONIC_IS_HARDWARE" == "True" ]] && return 0
998998
return 1
999999
}
10001000

0 commit comments

Comments
 (0)