Merge "Remove ram/disk sched filters from default list"

2017-08-10 10:53:59 +00:00
parent c75a92e179 2fe96819c2
commit 40a2b85b08
2 changed files with 11 additions and 4 deletions
@@ -248,8 +248,6 @@ Related options:
        default=[
          "RetryFilter",
          "AvailabilityZoneFilter",
-          "RamFilter",
-          "DiskFilter",
          "ComputeFilter",
          "ComputeCapabilitiesFilter",
          "ImagePropertiesFilter",
@@ -262,8 +260,7 @@ Related options:
 Filters that the scheduler will use.

 An ordered list of filter class names that will be used for filtering
-hosts. Ignore the word 'default' in the name of this option: these filters will
-*always* be applied, and they will be applied in the order they are listed so
+hosts. These filters will be applied in the order they are listed so
 place your most restrictive filters first to make the filtering process more
 efficient.

@@ -0,0 +1,10 @@
+---
+upgrade:
+  - |
+    Since we now use Placement to verify basic CPU/RAM/disk resources when
+    using the FilterScheduler, the ``RamFilter`` and ``DiskFilter`` entries are
+    being removed from the default value for the ``enabled_filters`` config
+    option in the ``[filter_scheduler]`` group.  If you are overriding this
+    option, you probably should remove them from your version.  If you are
+    using CachingScheduler you may wish to enable these filters as we will
+    not use Placement in that case.