Browse code

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

Jenkins authored on 2016/08/11 03:19:33
Showing 1 changed files
... ...
@@ -571,6 +571,12 @@ function configure_tempest {
571 571
     fi
572 572
     iniset $TEMPEST_CONFIG compute-feature-enabled api_extensions $compute_api_extensions
573 573
     # Neutron API Extensions
574
+
575
+    # disable metering if we didn't enable the service
576
+    if ! is_service_enabled q-metering; then
577
+        DISABLE_NETWORK_API_EXTENSIONS+=", metering"
578
+    fi
579
+
574 580
     local network_api_extensions=${NETWORK_API_EXTENSIONS:-"all"}
575 581
     if [[ ! -z "$DISABLE_NETWORK_API_EXTENSIONS" ]]; then
576 582
         # Enabled extensions are either the ones explicitly specified or those available on the API endpoint