From 0b304c5844c47ad877fd83f52b460a22bc14fd4a Mon Sep 17 00:00:00 2001 From: Jim Rollenhagen Date: Mon, 16 May 2016 08:55:37 -0400 Subject: [PATCH] Remove "discoverd" configuration group This has been deprecated for a few cycles now, remove it. Change-Id: I6787a1171da45853772d9ab337add6d9fc663680 --- etc/ironic/ironic.conf.sample | 3 --- ironic/drivers/modules/inspector.py | 9 +++------ .../notes/remove-discoverd-group-03eaf75e9f94d7be.yaml | 5 +++++ 3 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 releasenotes/notes/remove-discoverd-group-03eaf75e9f94d7be.yaml diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index 9522566dc3..843773644f 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -1224,18 +1224,15 @@ # whether to enable inspection using ironic-inspector (boolean # value) -# Deprecated group/name - [discoverd]/enabled #enabled = false # ironic-inspector HTTP endpoint. If this is not set, the # ironic-inspector client default (http://127.0.0.1:5050) will # be used. (string value) -# Deprecated group/name - [discoverd]/service_url #service_url = # period (in seconds) to check status of nodes on inspection # (integer value) -# Deprecated group/name - [discoverd]/status_check_period #status_check_period = 60 diff --git a/ironic/drivers/modules/inspector.py b/ironic/drivers/modules/inspector.py index 294bbf2b43..7aaa74530d 100644 --- a/ironic/drivers/modules/inspector.py +++ b/ironic/drivers/modules/inspector.py @@ -36,17 +36,14 @@ LOG = logging.getLogger(__name__) inspector_opts = [ cfg.BoolOpt('enabled', default=False, - help=_('whether to enable inspection using ironic-inspector'), - deprecated_group='discoverd'), + help=_('whether to enable inspection using ironic-inspector')), cfg.StrOpt('service_url', help=_('ironic-inspector HTTP endpoint. If this is not set, ' 'the ironic-inspector client default ' - '(http://127.0.0.1:5050) will be used.'), - deprecated_group='discoverd'), + '(http://127.0.0.1:5050) will be used.')), cfg.IntOpt('status_check_period', default=60, help=_('period (in seconds) to check status of nodes ' - 'on inspection'), - deprecated_group='discoverd'), + 'on inspection')), ] CONF = cfg.CONF diff --git a/releasenotes/notes/remove-discoverd-group-03eaf75e9f94d7be.yaml b/releasenotes/notes/remove-discoverd-group-03eaf75e9f94d7be.yaml new file mode 100644 index 0000000000..f6178235b0 --- /dev/null +++ b/releasenotes/notes/remove-discoverd-group-03eaf75e9f94d7be.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - Removes support for the deprecated "discoverd" group + for inspection options. Configuration files should use + the "inspector" group instead.