From 537155a982f8572d7668a841c12730a5602d039c Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem.os@gmail.com>
Date: Fri, 5 Jan 2018 11:22:38 -0500
Subject: [PATCH] Remove the deprecated scheduler_driver_task_period option

This option was deprecated in Ocata:

  I3f48e52815e80c99612bcd10cb53331a8c995fc3

This change removes it.

Change-Id: I108e8177a29acd136a1bc90cb072c9b765c96e5b
---
 nova/conf/scheduler.py                                      | 2 --
 ...emove-scheduler_driver_task_period-3d13293428db905d.yaml | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/remove-scheduler_driver_task_period-3d13293428db905d.yaml

diff --git a/nova/conf/scheduler.py b/nova/conf/scheduler.py
index bdf940f8a180..2612413cc5df 100644
--- a/nova/conf/scheduler.py
+++ b/nova/conf/scheduler.py
@@ -66,8 +66,6 @@ Possible values:
 """),
     cfg.IntOpt("periodic_task_interval",
         default=60,
-        deprecated_name="scheduler_driver_task_period",
-        deprecated_group="DEFAULT",
         help="""
 Periodic task interval.
 
diff --git a/releasenotes/notes/remove-scheduler_driver_task_period-3d13293428db905d.yaml b/releasenotes/notes/remove-scheduler_driver_task_period-3d13293428db905d.yaml
new file mode 100644
index 000000000000..62f1fee1b863
--- /dev/null
+++ b/releasenotes/notes/remove-scheduler_driver_task_period-3d13293428db905d.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    The ``[DEFAULT]/scheduler_driver_task_period`` configuration option,
+    which was deprecated in the 15.0.0 Ocata release, has now been removed.
+    Use the ``[scheduler]/periodic_task_interval`` option instead.