Update tempest compute flavor_ref/flavor_ref_alt

After Ironic is moved to devstack plugin the tempest is always
executed before ironic devstack plugin. Unfortunatly there is no quick
way to change order.
This change introduce new function ironic_configure_tempest that is
called from Ironic's devstack plugin. It updated flavor_ref and
flavor_ref_alt compute tempest options.

Change-Id: I85a77dd2193bac0ea4bd4fc1985c82d9f598b06b
This commit is contained in:
vsaienko 2016-03-15 18:07:43 +02:00 committed by Vasyl Saienko
parent 630063cc31
commit ba15202d99
2 changed files with 11 additions and 0 deletions

View File

@ -1044,6 +1044,14 @@ function cleanup_baremetal_basic_ops {
sudo rmmod nf_nat_tftp || true
}
function ironic_configure_tempest {
local bm_flavor_id
bm_flavor_id=$(openstack flavor show baremetal -f value -c id)
die_if_not_set $LINENO bm_flavor_id "Failed to get id of baremetal flavor"
iniset $TEMPEST_CONFIG compute flavor_ref $bm_flavor_id
iniset $TEMPEST_CONFIG compute flavor_ref_alt $bm_flavor_id
}
# Restore xtrace + pipefail
$_XTRACE_IRONIC
$_PIPEFAIL_IRONIC

View File

@ -26,6 +26,9 @@ if is_service_enabled ir-api ir-cond; then
echo_summary "Starting Ironic"
start_ironic
prepare_baremetal_basic_ops
if is_service_enabled tempest; then
ironic_configure_tempest
fi
fi
if [[ "$1" == "unstack" ]]; then