diff options
| author | Dmitry Tantsur <divius.inside@gmail.com> | 2018-02-14 17:47:55 +0100 |
|---|---|---|
| committer | Dmitry Tantsur <divius.inside@gmail.com> | 2018-02-23 14:58:28 +0000 |
| commit | 7cd9debf317972db2fce25bc3ce439162d400ff0 (patch) | |
| tree | 1771b6eaa866f2eecd2f6d88243a021bd45b1057 | |
| parent | 4c3a611ac3803a17dd584eb319f0bb40d6ee5ba3 (diff) | |
| download | ironic-7cd9debf317972db2fce25bc3ce439162d400ff0.tar.gz | |
Stop using --os-baremetal-api-version in devstack by default
We're defaulting to 'latest' in ironicclient now, so only use
it if IRONIC_DEFAULT_API_VERSION is overriden.
Change-Id: Ifa813a9f0980e7d9c65166ef288d0c6f273ba521
(cherry picked from commit f9a88a310a9f75164e83bda6d7c2085618375980)
| -rw-r--r-- | devstack/lib/ironic | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 0b192dbc3..48b553f54 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -139,8 +139,11 @@ if [[ -n "$BUILD_TIMEOUT" ]]; then echo "WARNING: BUILD_TIMEOUT variable is renamed to IRONIC_TEMPEST_BUILD_TIMEOUT and will be deprecated in Pike." fi -IRONIC_DEFAULT_API_VERSION=${IRONIC_DEFAULT_API_VERSION:-latest} -IRONIC_CMD="openstack --os-baremetal-api-version $IRONIC_DEFAULT_API_VERSION baremetal" +IRONIC_DEFAULT_API_VERSION=${IRONIC_DEFAULT_API_VERSION:-} +IRONIC_CMD="openstack baremetal" +if [[ -n "$IRONIC_DEFAULT_API_VERSION" ]]; then + IRONIC_CMD="$IRONIC_CMD --os-baremetal-api-version $IRONIC_DEFAULT_API_VERSION" +fi # driver / hardware type options IRONIC_ENABLED_DRIVERS=${IRONIC_ENABLED_DRIVERS:-fake,pxe_ipmitool,agent_ipmitool} |