From 427c0b5f46a3d2387194904923e9452566aa850d Mon Sep 17 00:00:00 2001
From: vsaienko <vsaienko@mirantis.com>
Date: Tue, 15 Mar 2016 18:07:43 +0200
Subject: 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
(cherry picked from commit ba15202d99b2c26ba3eaf319f1e3d20edb697483)
---
 devstack/lib/ironic | 8 ++++++++
 devstack/plugin.sh  | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index eb4fb1414..894893f18 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -1008,6 +1008,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
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index de584e6d9..06f83c8a4 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -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
-- 
cgit v1.2.1