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".