From 7c9641266f71910b65d3238fe264caab2f406af1 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Mon, 17 Jun 2019 15:24:24 -0400 Subject: [PATCH] Fix enabled_filters default value in admin config docs This fixes a couple of places in the admin scheduler config docs that were listing out the enabled_filters default value incorrectly because the ComputeFilter was missing. Rather than try to keep the docs mirrored with the actual default value, this change references the config option in one spot and avoids listing the defaults in another. Change-Id: I837aefcd37556a7b66b523529c5ca1f3dee8ac7f Closes-Bug: #1833120 --- doc/source/admin/configuration/schedulers.rst | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/doc/source/admin/configuration/schedulers.rst b/doc/source/admin/configuration/schedulers.rst index 96ce8d700f3c..3ea23fc81c12 100644 --- a/doc/source/admin/configuration/schedulers.rst +++ b/doc/source/admin/configuration/schedulers.rst @@ -117,14 +117,9 @@ you wanted to use both the built-in filters and your custom filter, your available_filters = nova.scheduler.filters.all_filters available_filters = myfilter.MyFilter -The ``enabled_filters`` configuration option in ``nova.conf`` defines -the list of filters that are applied by the ``nova-scheduler`` service. The -default filters are: - -.. code-block:: ini - - [filter_scheduler] - enabled_filters = RetryFilter, AvailabilityZoneFilter, ComputeCapabilitiesFilter, ImagePropertiesFilter, ServerGroupAntiAffinityFilter, ServerGroupAffinityFilter +The :oslo.config:option:`filter_scheduler.enabled_filters` configuration option +in ``nova.conf`` defines the list of filters that are applied by the +``nova-scheduler`` service. Compute filters ~~~~~~~~~~~~~~~ @@ -1106,7 +1101,7 @@ as well as the other filters that are typically enabled: .. code-block:: ini [filter_scheduler] - enabled_filters=AggregateInstanceExtraSpecsFilter,RetryFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter + enabled_filters=...,AggregateInstanceExtraSpecsFilter Example: Specify compute hosts with SSDs ----------------------------------------