@@ -103,9 +103,9 @@ FORCE_CONFIG_DRIVE=${FORCE_CONFIG_DRIVE:-"False"}

 # should work in most cases.

 SCHEDULER=${SCHEDULER:-filter_scheduler}

-# The following FILTERS contains SameHostFilter and DifferentHostFilter with

+# The following NOVA_FILTERS contains SameHostFilter and DifferentHostFilter with

 # the default filters.

-FILTERS="RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,SameHostFilter,DifferentHostFilter"

+NOVA_FILTERS="RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,SameHostFilter,DifferentHostFilter"

 QEMU_CONF=/etc/libvirt/qemu.conf

@@ -428,7 +428,7 @@ function create_nova_conf {

     iniset $NOVA_CONF wsgi api_paste_config "$NOVA_API_PASTE_INI"

     iniset $NOVA_CONF DEFAULT rootwrap_config "$NOVA_CONF_DIR/rootwrap.conf"

     iniset $NOVA_CONF scheduler driver "$SCHEDULER"

-    iniset $NOVA_CONF filter_scheduler enabled_filters "$FILTERS"

+    iniset $NOVA_CONF filter_scheduler enabled_filters "$NOVA_FILTERS"

     if [[ $SCHEDULER == "filter_scheduler" ]]; then

         iniset $NOVA_CONF scheduler workers "$API_WORKERS"

     fi

@@ -386,6 +386,11 @@ function configure_tempest {

     iniset $TEMPEST_CONFIG compute-feature-enabled block_migration_for_live_migration ${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False}

     iniset $TEMPEST_CONFIG compute-feature-enabled live_migrate_back_and_forth ${LIVE_MIGRATE_BACK_AND_FORTH:-False}

     iniset $TEMPEST_CONFIG compute-feature-enabled attach_encrypted_volume ${ATTACH_ENCRYPTED_VOLUME_AVAILABLE:-True}

+

+    if [[ -n "$NOVA_FILTERS" ]]; then

+        iniset $TEMPEST_CONFIG compute-feature-enabled scheduler_enabled_filters ${NOVA_FILTERS}

+    fi

+

     if is_service_enabled n-cell; then

         # Cells doesn't support shelving/unshelving

         iniset $TEMPEST_CONFIG compute-feature-enabled shelve False