Browse code

Merge "Enable/disable ironic in tempest config"

Jenkins authored on 2013/11/22 06:08:30
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
... ...
@@ -306,7 +306,7 @@ function configure_tempest() {
306 306
     iniset $TEMPEST_CONF cli cli_dir $NOVA_BIN_DIR
307 307
 
308 308
     # service_available
309
-    for service in nova cinder glance neutron swift heat horizon ceilometer; do
309
+    for service in nova cinder glance neutron swift heat horizon ceilometer ironic; do
310 310
         if is_service_enabled $service ; then
311 311
             iniset $TEMPEST_CONF service_available $service "True"
312 312
         else