From d0059595529883719726ec146534a6639dbae65e Mon Sep 17 00:00:00 2001
From: Roman Prykhodchenko <me@romcheg.me>
Date: Thu, 14 Nov 2013 09:58:53 +0200
Subject: [PATCH] Enable/disable ironic in tempest config

In order to run tempest tests for Ironic in devstack
the availability of the Ironic service must be set in
the tempest config.

This patch adds a shortcut for Ironic services and sets
availability of Ironic in tempest config.

Change-Id: I206fc2ea13412ceb128f8bfe90c153348d6f2f3e
---
 functions   | 1 +
 lib/tempest | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/functions b/functions
index afb75cce9c..9c65cd1209 100644
--- a/functions
+++ b/functions
@@ -841,6 +841,7 @@ function is_service_enabled() {
         [[ ${service} == "cinder" && ${ENABLED_SERVICES} =~ "c-" ]] && return 0
         [[ ${service} == "ceilometer" && ${ENABLED_SERVICES} =~ "ceilometer-" ]] && return 0
         [[ ${service} == "glance" && ${ENABLED_SERVICES} =~ "g-" ]] && return 0
+        [[ ${service} == "ironic" && ${ENABLED_SERVICES} =~ "ir-" ]] && return 0
         [[ ${service} == "neutron" && ${ENABLED_SERVICES} =~ "q-" ]] && return 0
         [[ ${service} == "trove" && ${ENABLED_SERVICES} =~ "tr-" ]] && return 0
         [[ ${service} == "swift" && ${ENABLED_SERVICES} =~ "s-" ]] && return 0
diff --git a/lib/tempest b/lib/tempest
index ec1fc90b76..fca3884e7f 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -300,7 +300,7 @@ function configure_tempest() {
     iniset $TEMPEST_CONF cli cli_dir $NOVA_BIN_DIR
 
     # service_available
-    for service in nova cinder glance neutron swift heat horizon ceilometer; do
+    for service in nova cinder glance neutron swift heat horizon ceilometer ironic; do
         if is_service_enabled $service ; then
             iniset $TEMPEST_CONF service_available $service "True"
         else