diff options
| author | Zuul <zuul@review.opendev.org> | 2021-02-03 04:26:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-02-03 04:26:51 +0000 |
| commit | 398872e7564e710a95aab0cddccaa1f56d9fdb6f (patch) | |
| tree | 97df15b5b11756bfbfbcbb5642a84d054116e032 | |
| parent | 8d0cef5cb8786ca950a4f9febf5a1373fede189a (diff) | |
| parent | 13e77e2179937f7fdf42ae40bc58af9909721526 (diff) | |
| download | ironic-398872e7564e710a95aab0cddccaa1f56d9fdb6f.tar.gz | |
Merge "Fix Mis-Ordering of Bash Variable Definition in DevStack"
| -rw-r--r-- | devstack/lib/ironic | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index d1c98f597..69f26b8fd 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -271,6 +271,13 @@ if [[ "$hostdomain" =~ "rax" ]]; then fi fi +# Which deploy driver to use - valid choices right now +# are ``ipmi``, ``snmp`` and ``redfish``. +# +# Additional valid choices if IRONIC_IS_HARDWARE == true are: +# ``idrac`` and ``irmc``. +IRONIC_DEPLOY_DRIVER=${IRONIC_DEPLOY_DRIVER:-ipmi} + # If present, these files are used as deploy ramdisk/kernel. # (The value must be an absolute path) IRONIC_DEPLOY_RAMDISK=${IRONIC_DEPLOY_RAMDISK:-$TOP_DIR/files/ir-deploy-$IRONIC_DEPLOY_DRIVER.initramfs} @@ -333,12 +340,6 @@ if [[ "$IRONIC_DEPLOY_ISO_REQUIRED" = "True" \ die "Prebuilt ISOs are not available, provide an ISO via IRONIC_DEPLOY_ISO \ or set IRONIC_BUILD_DEPLOY_RAMDISK=True to use ISOs" fi -# Which deploy driver to use - valid choices right now -# are ``ipmi``, ``snmp`` and ``redfish``. -# -# Additional valid choices if IRONIC_IS_HARDWARE == true are: -# ``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 if [[ -z "$(echo ${IRONIC_ENABLED_HARDWARE_TYPES} | grep -w ${IRONIC_DEPLOY_DRIVER})" ]]; then |