diff options
| author | Hironori Shiina <shiina.hironori@jp.fujitsu.com> | 2018-03-28 20:31:45 +0900 |
|---|---|---|
| committer | Hironori Shiina <shiina.hironori@jp.fujitsu.com> | 2018-03-29 05:49:23 +0000 |
| commit | aafa9accf23210ffb42efce72a1ae6c6d7991814 (patch) | |
| tree | 286c9bc711aa314ad29227dd39a0454f73ffa1c2 /devstack | |
| parent | 57bca71bc6c3e31fde202510ae6499c494216874 (diff) | |
| download | ironic-aafa9accf23210ffb42efce72a1ae6c6d7991814.tar.gz | |
DevStack: Enroll node with iRMC hardware
This patch enables enrolling nodes with a hardware info file when iRMC
hardware type (or classic driver) is used.
Change-Id: Ibdbdb11fbbf7a8872d6ad02e21ceddae6b180506
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/lib/ironic | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 75afd3bd6..f2b1e2dbf 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -109,6 +109,9 @@ IRONIC_HW_ARCH=${IRONIC_HW_ARCH:-x86_64} # *_drac: # <BMC address> <MAC address> <BMC username> <BMC password> # +# * irmc: +# <BMC address> <MAC address> <BMC username> <BMC password> +# IRONIC_HWINFO_FILE=${IRONIC_HWINFO_FILE:-$IRONIC_DATA_DIR/hardware_info} # Set up defaults for functional / integration testing @@ -624,6 +627,11 @@ function is_deployed_by_redfish { return 1 } +function is_deployed_by_irmc { + [[ -z "${IRONIC_DEPLOY_DRIVER##*irmc}" ]] && return 0 + return 1 +} + function is_drac_enabled { [[ -z "${IRONIC_ENABLED_DRIVERS##*_drac}" ]] && return 0 return 1 @@ -1936,6 +1944,13 @@ function enroll_nodes { node_options+=" --driver-info drac_host=$bmc_address \ --driver-info drac_password=$bmc_passwd \ --driver-info drac_username=$bmc_username" + elif is_deployed_by_irmc; then + node_options+=" --driver-info irmc_address=$bmc_address \ + --driver-info irmc_password=$bmc_passwd \ + --driver-info irmc_username=$bmc_username" + if [[ -n "$IRONIC_DEPLOY_ISO_ID" ]]; then + node_options+=" --driver-info irmc_deploy_iso=$IRONIC_DEPLOY_ISO_ID" + fi fi interface_info="${mac_address}" |