From 2fe96819c24eff5a9493a6559f3e8d5b4624a8c9 Mon Sep 17 00:00:00 2001
From: Chris Friesen <chris.friesen@windriver.com>
Date: Tue, 8 Aug 2017 10:31:54 -0600
Subject: [PATCH] Remove ram/disk sched filters from default list

Since we now use placement to verify basic CPU/RAM/disk resources,
we should default to disabling the equivalent scheduler filters.

Oddly enough, CoreFilter was already disabled so now also disable
RamFilter and DiskFilter.

Closes-Bug: #1709328
Change-Id: Ibe1cee1cb2642f61a8d6bf9c3f6bbee4f2c2f414
---
 nova/conf/scheduler.py                                 |  5 +----
 .../trim-default-sched-filters-e70de3bb4c7b1a1b.yaml   | 10 ++++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/trim-default-sched-filters-e70de3bb4c7b1a1b.yaml

diff --git a/nova/conf/scheduler.py b/nova/conf/scheduler.py
index 3aefed75bd1f..8d3c1d757fcb 100644
--- a/nova/conf/scheduler.py
+++ b/nova/conf/scheduler.py
@@ -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.
 
diff --git a/releasenotes/notes/trim-default-sched-filters-e70de3bb4c7b1a1b.yaml b/releasenotes/notes/trim-default-sched-filters-e70de3bb4c7b1a1b.yaml
new file mode 100644
index 000000000000..8930992d248a
--- /dev/null
+++ b/releasenotes/notes/trim-default-sched-filters-e70de3bb4c7b1a1b.yaml
@@ -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.