openstack/ironic
Code Issues Proposed changes

Remove [conductor]/clean_nodes config option

Browse Source 
This was deprecated a while ago and was slated for removal during
Newton. Do it.

Change-Id: Iac94720c357350160521688adb68d8bef7c04aae
This commit is contained in:
Jim Rollenhagen 2016-05-16 09:15:13 -04:00
parent 7054e289f7
commit 759e91632b
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -671,7 +671,6 @@
# significantly longer. In an environment where all tenants # significantly longer. In an environment where all tenants
# are trusted (eg, because there is only one tenant), this # are trusted (eg, because there is only one tenant), this
# option could be safely disabled. (boolean value) # option could be safely disabled. (boolean value)
# Deprecated group/name - [conductor]/clean_nodes
#automated_clean = true #automated_clean = true
# Timeout (seconds) to wait for a callback from the ramdisk # Timeout (seconds) to wait for a callback from the ramdisk

3
ironic/conductor/manager.py
View File

@ -152,11 +152,8 @@ conductor_opts = [
default=1800, default=1800,
help=_('Timeout (seconds) for waiting for node inspection. ' help=_('Timeout (seconds) for waiting for node inspection. '
'0 - unlimited.')), '0 - unlimited.')),
# TODO(rloo): Remove support for deprecated name 'clean_nodes' in Newton
# cycle.
cfg.BoolOpt('automated_clean', cfg.BoolOpt('automated_clean',
default=True, default=True,
deprecated_name='clean_nodes',
help=_('Enables or disables automated cleaning. Automated ' help=_('Enables or disables automated cleaning. Automated '
'cleaning is a configurable set of steps, ' 'cleaning is a configurable set of steps, '
'such as erasing disk drives, that are performed on ' 'such as erasing disk drives, that are performed on '

5
releasenotes/notes/remove-clean-nodes-38cfa633ca518f99.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- Remove the deprecated "[conductor]/clean_nodes" option.
Configuration files should instead use the
"[conductor]/automated_clean" option.