From c96860fb90160021f5cf1c6cc5570f39cbcdb258 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Wed, 15 Jan 2025 02:36:00 +0900
Subject: [PATCH] Drop deprecated compatibility logic

The logic was deprecated in multiple cycles ago[1] so can be removed
now.

[1] c6e82df318d5677b70a3a71b84fee533d202bbda

Change-Id: I66f4b40f2550c9daaafbd4de699d5280887f856f
---
 manifests/scheduler.pp                               | 12 ++----------
 ...duler-driver-no-false-value-c24c863fdbae47e9.yaml |  7 +++++++
 2 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 releasenotes/notes/scheduler-driver-no-false-value-c24c863fdbae47e9.yaml

diff --git a/manifests/scheduler.pp b/manifests/scheduler.pp
index ccf116ad..0350ea92 100644
--- a/manifests/scheduler.pp
+++ b/manifests/scheduler.pp
@@ -30,16 +30,8 @@ class manila::scheduler (
   include manila::deps
   include manila::params
 
-  if $scheduler_driver {
-    manila_config {
-      'DEFAULT/scheduler_driver': value => $scheduler_driver
-    }
-  } else {
-    warning("Using a false value for scheduler_driver is deprecated. \
-Use the os_service_default fact instead.")
-    manila_config {
-      'DEFAULT/scheduler_driver': value => $facts['os_service_default']
-    }
+  manila_config {
+    'DEFAULT/scheduler_driver': value => $scheduler_driver
   }
 
   if $::manila::params::scheduler_package {
diff --git a/releasenotes/notes/scheduler-driver-no-false-value-c24c863fdbae47e9.yaml b/releasenotes/notes/scheduler-driver-no-false-value-c24c863fdbae47e9.yaml
new file mode 100644
index 00000000..d8182491
--- /dev/null
+++ b/releasenotes/notes/scheduler-driver-no-false-value-c24c863fdbae47e9.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    Support for using a false value to set
+    the ``manila::scheduler::scheduler_driver`` parameter to remove
+    the ``[DEFAULT] scheduler_driver`` option from manila.conf has been
+    removed. Use the ``os_service_default`` fact instead.