openstack/devstack
Code Issues Proposed changes

Merge "Enable/disable ironic in tempest config"

Browse Source
This commit is contained in:
Jenkins 2013-11-21 21:08:30 +00:00 committed by Gerrit Code Review
commit 921c508027
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
functions
View File

@ -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

2
lib/tempest
View File

@ -306,7 +306,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