Browse code

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

Roman Prykhodchenko authored on 2013/11/14 16:58:53
Showing 2 changed files
... ...
@@ -841,6 +841,7 @@ function is_service_enabled() {
841 841
         [[ ${service} == "cinder" && ${ENABLED_SERVICES} =~ "c-" ]] && return 0
842 842
         [[ ${service} == "ceilometer" && ${ENABLED_SERVICES} =~ "ceilometer-" ]] && return 0
843 843
         [[ ${service} == "glance" && ${ENABLED_SERVICES} =~ "g-" ]] && return 0
844
+        [[ ${service} == "ironic" && ${ENABLED_SERVICES} =~ "ir-" ]] && return 0
844 845
         [[ ${service} == "neutron" && ${ENABLED_SERVICES} =~ "q-" ]] && return 0
845 846
         [[ ${service} == "trove" && ${ENABLED_SERVICES} =~ "tr-" ]] && return 0
846 847
         [[ ${service} == "swift" && ${ENABLED_SERVICES} =~ "s-" ]] && return 0
... ...
@@ -300,7 +300,7 @@ function configure_tempest() {
300 300
     iniset $TEMPEST_CONF cli cli_dir $NOVA_BIN_DIR
301 301
 
302 302
     # service_available
303
-    for service in nova cinder glance neutron swift heat horizon ceilometer; do
303
+    for service in nova cinder glance neutron swift heat horizon ceilometer ironic; do
304 304
         if is_service_enabled $service ; then
305 305
             iniset $TEMPEST_CONF service_available $service "True"
306 306
         else