From 346edcc532719f6f29471920f9434b6d5300d43a Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 26 Aug 2015 09:38:37 -0400 Subject: [PATCH] check all possible services when configuring tempest The previous approach assumed that devstack in tree service support would always be a super set of tempest. That's not necessarily true. Instead when configuring tempest we should look at all the possible services that tempest could know about, which will let us disable services we don't have support for. Change-Id: I9c24705e494689f09a885eb0a640efd50db33fcf --- lib/ceilometer | 3 --- lib/cinder | 3 --- lib/glance | 3 --- lib/heat | 4 ---- lib/horizon | 4 ---- lib/ironic | 3 --- lib/neutron-legacy | 4 ---- lib/nova | 4 ---- lib/swift | 4 ---- lib/tempest | 5 +++++ lib/zaqar | 4 ---- stackrc | 6 ------ 12 files changed, 5 insertions(+), 42 deletions(-) diff --git a/lib/ceilometer b/lib/ceilometer index 3df75b7300..d1cc862160 100644 --- a/lib/ceilometer +++ b/lib/ceilometer @@ -102,9 +102,6 @@ CEILOMETER_EVENTS=${CEILOMETER_EVENTS:-True} CEILOMETER_COORDINATION_URL=${CEILOMETER_COORDINATION_URL:-} CEILOMETER_PIPELINE_INTERVAL=${CEILOMETER_PIPELINE_INTERVAL:-} -# Tell Tempest this project is present -TEMPEST_SERVICES+=,ceilometer - # Functions # --------- diff --git a/lib/cinder b/lib/cinder index e5ed2db1a3..26277ccaba 100644 --- a/lib/cinder +++ b/lib/cinder @@ -108,9 +108,6 @@ CINDER_PERIODIC_INTERVAL=${CINDER_PERIODIC_INTERVAL:-60} CINDER_ISCSI_HELPER=${CINDER_ISCSI_HELPER:-tgtadm} -# Tell Tempest this project is present -TEMPEST_SERVICES+=,cinder - # Source the enabled backends if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then diff --git a/lib/glance b/lib/glance index b1b0f32f62..7be3a8495c 100644 --- a/lib/glance +++ b/lib/glance @@ -75,9 +75,6 @@ GLANCE_SEARCH_PORT=${GLANCE_SEARCH_PORT:-9393} GLANCE_SEARCH_PORT_INT=${GLANCE_SEARCH_PORT_INT:-19393} GLANCE_SEARCH_HOSTPORT=${GLANCE_SEARCH_HOSTPORT:-$GLANCE_SERVICE_HOST:$GLANCE_SEARCH_PORT} -# Tell Tempest this project is present -TEMPEST_SERVICES+=,glance - # Functions # --------- diff --git a/lib/heat b/lib/heat index cedddd2d26..3489578162 100644 --- a/lib/heat +++ b/lib/heat @@ -64,10 +64,6 @@ else HEAT_DEFERRED_AUTH=${HEAT_DEFERRED_AUTH:-trusts} fi -# Tell Tempest this project is present -TEMPEST_SERVICES+=,heat - - # Functions # --------- diff --git a/lib/horizon b/lib/horizon index 9fe0aa8b49..b2539d1b7d 100644 --- a/lib/horizon +++ b/lib/horizon @@ -35,10 +35,6 @@ HORIZON_DIR=$DEST/horizon # The example file in Horizon repo is used by default. HORIZON_SETTINGS=${HORIZON_SETTINGS:-$HORIZON_DIR/openstack_dashboard/local/local_settings.py.example} -# Tell Tempest this project is present -TEMPEST_SERVICES+=,horizon - - # Functions # --------- diff --git a/lib/ironic b/lib/ironic index b3ad586923..cc1dfe31d9 100644 --- a/lib/ironic +++ b/lib/ironic @@ -114,9 +114,6 @@ IRONIC_SERVICE_PROTOCOL=http IRONIC_SERVICE_PORT=${IRONIC_SERVICE_PORT:-6385} IRONIC_HOSTPORT=${IRONIC_HOSTPORT:-$SERVICE_HOST:$IRONIC_SERVICE_PORT} -# Tell Tempest this project is present -TEMPEST_SERVICES+=,ironic - # Enable iPXE IRONIC_IPXE_ENABLED=$(trueorfalse False IRONIC_IPXE_ENABLED) IRONIC_HTTP_DIR=${IRONIC_HTTP_DIR:-$IRONIC_DATA_DIR/httpboot} diff --git a/lib/neutron-legacy b/lib/neutron-legacy index da8c06446c..9fb668ef81 100644 --- a/lib/neutron-legacy +++ b/lib/neutron-legacy @@ -358,10 +358,6 @@ else Q_USE_SECGROUP=False fi -# Tell Tempest this project is present -TEMPEST_SERVICES+=,neutron - - # Save trace setting XTRACE=$(set +o | grep xtrace) set +o xtrace diff --git a/lib/nova b/lib/nova index 6441a891eb..d4be019ae3 100644 --- a/lib/nova +++ b/lib/nova @@ -167,10 +167,6 @@ NOVA_ALLOW_MOVE_TO_SAME_HOST=$(trueorfalse True NOVA_ALLOW_MOVE_TO_SAME_HOST) TEST_FLOATING_POOL=${TEST_FLOATING_POOL:-test} TEST_FLOATING_RANGE=${TEST_FLOATING_RANGE:-192.168.253.0/29} -# Tell Tempest this project is present -TEMPEST_SERVICES+=,nova - - # Functions # --------- diff --git a/lib/swift b/lib/swift index fc736a60bc..b119d2fd35 100644 --- a/lib/swift +++ b/lib/swift @@ -141,10 +141,6 @@ SWIFT_TEMPURL_KEY=${SWIFT_TEMPURL_KEY:-} # Toggle for deploying Swift under HTTPD + mod_wsgi SWIFT_USE_MOD_WSGI=${SWIFT_USE_MOD_WSGI:-False} -# Tell Tempest this project is present -TEMPEST_SERVICES+=,swift - - # Functions # --------- diff --git a/lib/tempest b/lib/tempest index fe63015c5d..323a90a4cd 100644 --- a/lib/tempest +++ b/lib/tempest @@ -536,6 +536,11 @@ function configure_tempest { fi # ``service_available`` + # + # this tempest service list needs to be all the services that + # tempest supports, otherwise we can have an erroneous set of + # defaults (something defaulting true in Tempest, but not listed here). + TEMPEST_SERVICES="key,glance,nova,neutron,cinder,swift,heat,ceilometer,horizon,sahara,ironic,trove,zaqar" for service in ${TEMPEST_SERVICES//,/ }; do if is_service_enabled $service ; then iniset $TEMPEST_CONFIG service_available $service "True" diff --git a/lib/zaqar b/lib/zaqar index fdab3a26a8..aa21aac271 100644 --- a/lib/zaqar +++ b/lib/zaqar @@ -59,10 +59,6 @@ ZAQAR_SERVICE_HOST=${ZAQAR_SERVICE_HOST:-$SERVICE_HOST} ZAQAR_SERVICE_PORT=${ZAQAR_SERVICE_PORT:-8888} ZAQAR_SERVICE_PROTOCOL=${ZAQAR_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL} -# Tell Tempest this project is present -TEMPEST_SERVICES+=,zaqar - - # Functions # --------- diff --git a/stackrc b/stackrc index 156cb1f85a..67b6424aab 100644 --- a/stackrc +++ b/stackrc @@ -78,12 +78,6 @@ fi # services will rely on the local toggle variable (e.g. ``KEYSTONE_USE_MOD_WSGI``) ENABLE_HTTPD_MOD_WSGI_SERVICES=True -# Tell Tempest which services are available. The default is set here as -# Tempest falls late in the configuration sequence. This differs from -# ``ENABLED_SERVICES`` in that the project names are used here rather than -# the service names, i.e.: ``TEMPEST_SERVICES="key,glance,nova"`` -TEMPEST_SERVICES="" - # Set the default Nova APIs to enable NOVA_ENABLED_APIS=ec2,osapi_compute,metadata