openstack/ironic
Code Issues Proposed changes

Remove "discoverd" configuration group

Browse Source 
This has been deprecated for a few cycles now, remove it.

Change-Id: I6787a1171da45853772d9ab337add6d9fc663680
This commit is contained in:
Jim Rollenhagen 2016-05-16 08:55:37 -04:00
parent 1bdecdb7ca
commit 0b304c5844
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/ironic/ironic.conf.sample
View File

@ -1224,18 +1224,15 @@
# whether to enable inspection using ironic-inspector (boolean # whether to enable inspection using ironic-inspector (boolean
# value) # value)
# Deprecated group/name - [discoverd]/enabled
#enabled = false #enabled = false
# ironic-inspector HTTP endpoint. If this is not set, the # ironic-inspector HTTP endpoint. If this is not set, the
# ironic-inspector client default (http://127.0.0.1:5050) will # ironic-inspector client default (http://127.0.0.1:5050) will
# be used. (string value) # be used. (string value)
# Deprecated group/name - [discoverd]/service_url
#service_url = <None> #service_url = <None>
# period (in seconds) to check status of nodes on inspection # period (in seconds) to check status of nodes on inspection
# (integer value) # (integer value)
# Deprecated group/name - [discoverd]/status_check_period
#status_check_period = 60 #status_check_period = 60

9
ironic/drivers/modules/inspector.py
View File

@ -36,17 +36,14 @@ LOG = logging.getLogger(__name__)
inspector_opts = [ inspector_opts = [
cfg.BoolOpt('enabled', default=False, cfg.BoolOpt('enabled', default=False,
help=_('whether to enable inspection using ironic-inspector'), help=_('whether to enable inspection using ironic-inspector')),
deprecated_group='discoverd'),
cfg.StrOpt('service_url', cfg.StrOpt('service_url',
help=_('ironic-inspector HTTP endpoint. If this is not set, ' help=_('ironic-inspector HTTP endpoint. If this is not set, '
'the ironic-inspector client default ' 'the ironic-inspector client default '
'(http://127.0.0.1:5050) will be used.'), '(http://127.0.0.1:5050) will be used.')),
deprecated_group='discoverd'),
cfg.IntOpt('status_check_period', default=60, cfg.IntOpt('status_check_period', default=60,
help=_('period (in seconds) to check status of nodes ' help=_('period (in seconds) to check status of nodes '
'on inspection'), 'on inspection')),
deprecated_group='discoverd'),
] ]
CONF = cfg.CONF CONF = cfg.CONF

5
releasenotes/notes/remove-discoverd-group-03eaf75e9f94d7be.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- Removes support for the deprecated "discoverd" group
for inspection options. Configuration files should use
the "inspector" group instead.