Merge "PXE filter options have no effect yet"

This commit is contained in:
Jenkins 2017-08-15 18:13:02 +00:00 committed by Gerrit Code Review
commit 0d28939315
3 changed files with 8 additions and 4 deletions

View File

@ -320,6 +320,8 @@ the database::
Implementing PXE Filter Drivers Implementing PXE Filter Drivers
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. note:: It is not possible yet to use PXE filter drivers.
Background Background
---------- ----------

View File

@ -761,11 +761,12 @@
# From ironic_inspector # From ironic_inspector
# #
# PXE boot filter driver to use, such as iptables (string value) # PXE boot filter driver to use, such as iptables. This option has no
# effect yet. (string value)
#driver = noop #driver = noop
# Amount of time in seconds, after which repeat periodic update of the # Amount of time in seconds, after which repeat periodic update of the
# filter. (integer value) # filter. This option has no effect yet. (integer value)
# Minimum value: 0 # Minimum value: 0
#sync_period = 15 #sync_period = 15

View File

@ -190,10 +190,11 @@ SERVICE_OPTS = [
PXE_FILTER_OPTS = [ PXE_FILTER_OPTS = [
cfg.StrOpt('driver', default='noop', cfg.StrOpt('driver', default='noop',
help=_('PXE boot filter driver to use, such as iptables')), help=_('PXE boot filter driver to use, such as iptables. '
'This option has no effect yet.')),
cfg.IntOpt('sync_period', default=15, min=0, cfg.IntOpt('sync_period', default=15, min=0,
help=_('Amount of time in seconds, after which repeat periodic ' help=_('Amount of time in seconds, after which repeat periodic '
'update of the filter.')), 'update of the filter. This option has no effect yet.')),
] ]
cfg.CONF.register_opts(SERVICE_OPTS) cfg.CONF.register_opts(SERVICE_OPTS)