From 98723966ce061104de816c2be34c884783976fa4 Mon Sep 17 00:00:00 2001
From: ghanshyam <gmann@ghanshyammann.com>
Date: Mon, 26 Nov 2018 09:41:22 +0000
Subject: [PATCH] Set Tempest's service_availability setting for Heat

Tempest's service_availability config option includes all the service
availability which is further used by tests to take decision of skip
or run the test.

For example, [service_availability].heat is true then, heat test will run
or if [service_availability].heat is false then, all the heat related tests either
in heat tempest plugin or any other plugins will be skipped.

Currently this setting for heat service[1] is in devstack lib/tempest
which is being removed by - https://review.openstack.org/#/c/619973/

For better maintenance, we are moving all tempest non-owned service setting
to service devstack plugin side.

This commit add the setting of heat service on ceilometer devstack plugin.

Related-Bug: #1743688
[1] https://github.com/openstack/heat-tempest-plugin/blob/d6b253502af379cce420723fd5ab997bbf6487b5/heat_tempest_plugin/config.py#L15

Depends-On: https://review.openstack.org/#/c/619990/
Change-Id: I5013ce8be1a4fb5219ea89a63add812558191025
Needed-By: https://review.openstack.org/#/c/619973/
---
 devstack/lib/heat  | 9 +++++++++
 devstack/plugin.sh | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/devstack/lib/heat b/devstack/lib/heat
index caed12f984..82e88e6c33 100644
--- a/devstack/lib/heat
+++ b/devstack/lib/heat
@@ -442,6 +442,15 @@ function create_heat_accounts {
     fi
 }
 
+# configure_tempest_for_heat()
+# NOTE (gmann): Configure all the Tempest setting for Heat service in
+# this function.
+function configure_tempest_for_heat {
+    if is_service_enabled tempest; then
+        iniset $TEMPEST_CONFIG service_available heat True
+    fi
+}
+
 # Restore xtrace
 $_XTRACE_HEAT
 
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index aa2dcdae36..ae919b6bb5 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -35,6 +35,10 @@ if is_heat_enabled; then
         # Start the heat API and heat taskmgr components
         echo_summary "Starting heat"
         start_heat
+
+    elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
+        echo_summary "Configuring Tempest for Heat"
+        configure_tempest_for_heat
     fi
 
     if [[ "$1" == "unstack" ]]; then