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

 # ---------

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

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

 # ---------

@@ -64,10 +64,6 @@ else

     HEAT_DEFERRED_AUTH=${HEAT_DEFERRED_AUTH:-trusts}

 fi

-# Tell Tempest this project is present

-TEMPEST_SERVICES+=,heat

-

-

 # Functions

 # ---------

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

 # ---------

@@ -115,9 +115,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}

@@ -356,10 +356,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

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

 # ---------

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

 # ---------

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

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

 # ---------

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