From 5130a3c2c0ea65b28a7db17ecc602210a5dc183c Mon Sep 17 00:00:00 2001 From: ghanshyam Date: Thu, 8 Dec 2016 13:02:59 +0900 Subject: [PATCH] Move baremetal tempest config setting from devstack Now all configuration are present in Ironic tempest plugin and those are going to be removed from tempest in Id518a6d87d0949737cd1c50cb6a83149b85e5f85 Currently devstack set those in tempest configuration, but it will be good to move those to ironic devstack plugin. If826321ebc0c20ea372d206d49383f3826c9b547 removes the same from devstack. Few are not moved as nobody use those or already deleted- driver_enabled deploy_img_dir node_uuid Change-Id: I73c649625d106fc7f068e12e21eaacba8f43cbbb --- devstack/lib/ironic | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index baaffed766..70f62177d2 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -133,6 +133,11 @@ IRONIC_CLEAN_NET_NAME=${IRONIC_CLEAN_NET_NAME:-${IRONIC_PROVISION_NETWORK_NAME:- IRONIC_EXTRA_PXE_PARAMS=${IRONIC_EXTRA_PXE_PARAMS:-} IRONIC_TTY_DEV=${IRONIC_TTY_DEV:-ttyS0} +IRONIC_TEMPEST_BUILD_TIMEOUT=${IRONIC_TEMPEST_BUILD_TIMEOUT:-${BUILD_TIMEOUT:-}} +if [[ -n "$BUILD_TIMEOUT" ]]; then + echo "WARNING: BUILD_TIMEOUT variable is renamed to IRONIC_TEMPEST_BUILD_TIMEOUT and will be deprecated in Pike." +fi + # NOTE(vsaienko) nova already pick right libvirt type at # https://review.openstack.org/#/c/31177/4/lib/nova@240 # pick hardware virtualization if possible while it is not set explicitly @@ -1721,6 +1726,13 @@ function ironic_configure_tempest { image_uuid=$(openstack image show $IRONIC_IMAGE_NAME -f value -c id) iniset $TEMPEST_CONFIG compute image_ref $image_uuid iniset $TEMPEST_CONFIG compute image_ref_alt $image_uuid + + if [[ -n "${IRONIC_TEMPEST_BUILD_TIMEOUT}" ]]; then + iniset $TEMPEST_CONFIG baremetal unprovision_timeout $IRONIC_TEMPEST_BUILD_TIMEOUT + iniset $TEMPEST_CONFIG baremetal active_timeout $IRONIC_TEMPEST_BUILD_TIMEOUT + iniset $TEMPEST_CONFIG baremetal deploywait_timeout $IRONIC_TEMPEST_BUILD_TIMEOUT + iniset $TEMPEST_CONFIG baremetal power_timeout $IRONIC_TEMPEST_BUILD_TIMEOUT + fi } function get_ironic_node_prefix {