From ca218a4ac513e7fb71290a6b19e68169550687b8 Mon Sep 17 00:00:00 2001
From: Jim Rollenhagen <jim@jimrollenhagen.com>
Date: Mon, 16 May 2016 09:07:24 -0400
Subject: [PATCH] Remove "periodic_interval" config option

This was deprecated February 24, 2016. It's time to remove it.

Change-Id: If82a6a2c94b22ddcd8707bc8bd7f73ecaa24e021
---
 etc/ironic/ironic.conf.sample                               | 6 ------
 ironic/common/service.py                                    | 5 -----
 .../notes/remove-periodic-interval-45f57ebad9aaa14e.yaml    | 3 +++
 3 files changed, 3 insertions(+), 11 deletions(-)
 create mode 100644 releasenotes/notes/remove-periodic-interval-45f57ebad9aaa14e.yaml

diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index 9cb29db807..e0b9b3d6ae 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -117,12 +117,6 @@
 # Options defined in ironic.common.service
 #
 
-# Default interval (in seconds) for running driver periodic
-# tasks. (integer value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-#periodic_interval = 60
-
 # Name of this node. This can be an opaque identifier. It is
 # not necessarily a hostname, FQDN, or IP address. However,
 # the node name must be valid within an AMQP key, and if using
diff --git a/ironic/common/service.py b/ironic/common/service.py
index c1538830b4..2cbcf6b755 100644
--- a/ironic/common/service.py
+++ b/ironic/common/service.py
@@ -38,11 +38,6 @@ from ironic.objects import base as objects_base
 
 
 service_opts = [
-    cfg.IntOpt('periodic_interval',
-               default=60,
-               help=_('Default interval (in seconds) for running driver '
-                      'periodic tasks.'),
-               deprecated_for_removal=True),
     cfg.StrOpt('host',
                default=socket.getfqdn(),
                help=_('Name of this node. This can be an opaque identifier. '
diff --git a/releasenotes/notes/remove-periodic-interval-45f57ebad9aaa14e.yaml b/releasenotes/notes/remove-periodic-interval-45f57ebad9aaa14e.yaml
new file mode 100644
index 0000000000..e15e53407d
--- /dev/null
+++ b/releasenotes/notes/remove-periodic-interval-45f57ebad9aaa14e.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Removes the deprecated config option "periodic_interval".