Merge "Remove "periodic_interval" config option"

This commit is contained in:
Jenkins 2016-05-24 15:05:38 +00:00 committed by Gerrit Code Review
commit 430da755d9
3 changed files with 3 additions and 11 deletions

View File

@ -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

View File

@ -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. '

View File

@ -0,0 +1,3 @@
---
upgrade:
- Removes the deprecated config option "periodic_interval".