Browse code

Merge "tempest: Disable l3_agent_scheduler when running without L3 agent"

Jenkins authored on 2017/09/02 19:24:41
Showing 1 changed files
... ...
@@ -574,6 +574,11 @@ function configure_tempest {
574 574
         DISABLE_NETWORK_API_EXTENSIONS+=", metering"
575 575
     fi
576 576
 
577
+    # disable l3_agent_scheduler if we didn't enable L3 agent
578
+    if ! is_service_enabled q-l3; then
579
+        DISABLE_NETWORK_API_EXTENSIONS+=", l3_agent_scheduler"
580
+    fi
581
+
577 582
     local network_api_extensions=${NETWORK_API_EXTENSIONS:-"all"}
578 583
     if [[ ! -z "$DISABLE_NETWORK_API_EXTENSIONS" ]]; then
579 584
         # Enabled extensions are either the ones explicitly specified or those available on the API endpoint