From f9a88a310a9f75164e83bda6d7c2085618375980 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 14 Feb 2018 17:47:55 +0100 Subject: [PATCH] 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 --- devstack/lib/ironic | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index be782bbbe6..328a12a837 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}