From c0e8c3848137a76f830d688c7fa9a95226262e61 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 28 Nov 2022 13:50:08 +0900
Subject: [PATCH] Use $::os_service_default by default

This change prepares getting rid of the additional logic to manage
the scheduler_driver option, to follow the global pattern to use
 $::os_service_default by default.

Change-Id: Ic1d01425123bf02fa3caaf9f2ba72ed2233fc914
---
 manifests/scheduler.pp                                 | 10 ++++++----
 ...ler_driver-os_service_default-5b7e2e78d93c6abe.yaml |  7 +++++++
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/scheduler_driver-os_service_default-5b7e2e78d93c6abe.yaml

diff --git a/manifests/scheduler.pp b/manifests/scheduler.pp
index 47093c13..3c2f62a7 100644
--- a/manifests/scheduler.pp
+++ b/manifests/scheduler.pp
@@ -6,7 +6,7 @@
 #
 # [*scheduler_driver*]
 #   (Optional) Default scheduler driver to use
-#   Defaults to false.
+#   Defaults to $::os_service_default.
 #
 # [*package_ensure*]
 #   (Optional) The state of the scheduler package
@@ -21,7 +21,7 @@
 #   Defaults to true.
 #
 class manila::scheduler (
-  $scheduler_driver = false,
+  $scheduler_driver = $::os_service_default,
   $package_ensure   = 'present',
   $enabled          = true,
   $manage_service   = true
@@ -32,11 +32,13 @@ class manila::scheduler (
 
   if $scheduler_driver {
     manila_config {
-      'DEFAULT/scheduler_driver': value => $scheduler_driver;
+      'DEFAULT/scheduler_driver': value => $scheduler_driver
     }
   } else {
+    warning('Using a false value for scheduler_driver is deprecated.'
+            + 'Use $::os_service_default instead.')
     manila_config {
-      'DEFAULT/scheduler_driver': value => $::os_service_default;
+      'DEFAULT/scheduler_driver': value => $::os_service_default
     }
   }
 
diff --git a/releasenotes/notes/scheduler_driver-os_service_default-5b7e2e78d93c6abe.yaml b/releasenotes/notes/scheduler_driver-os_service_default-5b7e2e78d93c6abe.yaml
new file mode 100644
index 00000000..a33f7906
--- /dev/null
+++ b/releasenotes/notes/scheduler_driver-os_service_default-5b7e2e78d93c6abe.yaml
@@ -0,0 +1,7 @@
+---
+deprecations:
+  - |
+    Using a false value for ``manila::scheduler::scheduler_driver``  has been
+    deprecated and the specified value will be directly rendered into
+    manila.conf in a future release. Use ``$::os_service_default`` if
+    the service default should be used.