Browse code
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
Lucas Alvares Gomes authored on 2016/02/19 00:52:22Showing 1 changed files
| ... | ... |
@@ -994,7 +994,7 @@ function get_endpoint_url {
|
| 994 | 994 |
# out of tree, as it is used by nova and neutron. |
| 995 | 995 |
# figure out a way to refactor nova/neutron code to eliminate this |
| 996 | 996 |
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 |
|
| 998 | 998 |
return 1 |
| 999 | 999 |
} |
| 1000 | 1000 |
|