openstack
/
ironic
Code Issues Proposed changes

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 f9a88a310a)
This commit is contained in:
Dmitry Tantsur 2018-02-14 17:47:55 +01:00
parent 4c3a611ac3
commit 7cd9debf31
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/lib/ironic
View File

@ -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}