Skip to content

Commit b56d81d

Browse files
author
Matthew Treinish
committed
Set service_available config options in tempest
This commit loops over the list of services that tempest has config options for in the service_available group and checks if the service is enabled. Devstack will then set whether or not the service is configured in tempest.conf. Change-Id: Ib845d3e098fd3f45c8c26f5696af14cca1534e01
1 parent c373cf8 commit b56d81d

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

lib/tempest

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,6 @@ function configure_tempest() {
251251
# Compute admin
252252
iniset $TEMPEST_CONF "compute-admin" password "$password" # DEPRECATED
253253

254-
# Network
255-
if is_service_enabled neutron; then
256-
iniset $TEMPEST_CONF service_available neutron "True"
257-
fi
258254
iniset $TEMPEST_CONF network api_version 2.0
259255
iniset $TEMPEST_CONF network tenant_networks_reachable "$tenant_networks_reachable"
260256
iniset $TEMPEST_CONF network public_network_id "$public_network_id"
@@ -268,11 +264,6 @@ function configure_tempest() {
268264
iniset $TEMPEST_CONF boto http_socket_timeout 30
269265
iniset $TEMPEST_CONF boto ssh_user ${DEFAULT_INSTANCE_USER:-cirros}
270266

271-
# Orchestration
272-
if is_service_enabled heat; then
273-
iniset $TEMPEST_CONF orchestration heat_available "True"
274-
fi
275-
276267
# Scenario
277268
iniset $TEMPEST_CONF scenario img_dir "$FILES/images/cirros-0.3.1-x86_64-uec"
278269

@@ -287,6 +278,15 @@ function configure_tempest() {
287278
# cli
288279
iniset $TEMPEST_CONF cli cli_dir $NOVA_BIN_DIR
289280

281+
# service_available
282+
for service in nova cinder glance neutron swift heat ; do
283+
if is_service_enabled $service ; then
284+
iniset $TEMPEST_CONF service_available $service "True"
285+
else
286+
iniset $TEMPEST_CONF service_available $service "False"
287+
fi
288+
done
289+
290290
echo "Created tempest configuration file:"
291291
cat $TEMPEST_CONF
292292

0 commit comments

Comments
 (0)