From 5b5530371833de51faeb0ca78b1eed8fd958cbc4 Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem.os@gmail.com>
Date: Tue, 28 Aug 2018 14:30:42 -0400
Subject: [PATCH] Remove deprecated Disk/RamFilter usage

As of change https://review.openstack.org/#/c/596502/ nova
has deprecated the RamFilter and DiskFilter since they are
not necessary when using the default scheduler driver
(filter_scheduler). This change removes their usage from
this deployment project.

Change-Id: I9c05016817cb03933292f09d06119795f8f451a0
---
 defaults/main.yml     | 4 +---
 templates/zun.conf.j2 | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 08a8117..aecd7b8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -203,9 +203,7 @@ zun_service_in_ldap: false
 zun_scheduler_default_filters: >-
   AvailabilityZoneFilter,
   CPUFilter,
-  RamFilter,
-  ComputeFilter,
-  DiskFilter
+  ComputeFilter
 zun_scheduler_available_filters: zun.scheduler.filters.all_filters
 zun_scheduler_driver: filter_scheduler
 
diff --git a/templates/zun.conf.j2 b/templates/zun.conf.j2
index 3d0bbb7..e35f3f6 100644
--- a/templates/zun.conf.j2
+++ b/templates/zun.conf.j2
@@ -2266,7 +2266,7 @@ available_filters = {{ zun_scheduler_available_filters }}
 #   'scheduler_available_filters' option, or a SchedulerHostFilterNotFound
 #   exception will be raised.
 #  (list value)
-#enabled_filters = AvailabilityZoneFilter,CPUFilter,RamFilter,ComputeFilter,DiskFilter
+#enabled_filters = AvailabilityZoneFilter,CPUFilter,ComputeFilter
 enabled_filters = {{ zun_scheduler_default_filters }}
 
 [ssl]