openstack/devstack
Code Issues Proposed changes

Merge "disable metering extension in tempest if q-metering not running"

Browse Source
This commit is contained in:
Jenkins
2016-08-10 18:19:33 +00:00
committed by Gerrit Code Review
parent 8befb78198 894ccc90c0
commit cb978241f4
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tempest
View File

@@ -571,6 +571,12 @@ function configure_tempest {
fi
iniset $TEMPEST_CONFIG compute-feature-enabled api_extensions $compute_api_extensions
# Neutron API Extensions
# disable metering if we didn't enable the service
if ! is_service_enabled q-metering; then
DISABLE_NETWORK_API_EXTENSIONS+=", metering"
fi
local network_api_extensions=${NETWORK_API_EXTENSIONS:-"all"}
if [[ ! -z "$DISABLE_NETWORK_API_EXTENSIONS" ]]; then
# Enabled extensions are either the ones explicitly specified or those available on the API endpoint