openstack/ironic
Code Issues Proposed changes

Remove two deprecated config option names from [agent] section

Browse Source 
Remove two deprecated options from the config group section [agent]
that were deprecated in the Liberty cycle. Those options are:

- agent_erase_devices_priority
- agent_erase_devices_iterations

These options had been renamed and deprecated by commit
9a35ca19b4

Change-Id: I9c6df0979c2814b5f26f8fb596de6cf07e4f76aa
This commit is contained in:
Ramamani Yeleswarapu 2016-04-11 16:25:21 -07:00
parent 38e554c77a
commit 15674eee47
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -916,12 +916,10 @@
# Agent ramdisk. If unset, will use the priority set in the # Agent ramdisk. If unset, will use the priority set in the
# ramdisk (defaults to 10 for the GenericHardwareManager). If # ramdisk (defaults to 10 for the GenericHardwareManager). If
# set to 0, will not run during cleaning. (integer value) # set to 0, will not run during cleaning. (integer value)
# Deprecated group/name - [agent]/agent_erase_devices_priority
#erase_devices_priority = <None> #erase_devices_priority = <None>
# Number of iterations to be run for erasing devices. (integer # Number of iterations to be run for erasing devices. (integer
# value) # value)
# Deprecated group/name - [agent]/agent_erase_devices_iterations
#erase_devices_iterations = 1 #erase_devices_iterations = 1
# Whether to power off a node after deploy failure. Defaults # Whether to power off a node after deploy failure. Defaults

6
ironic/drivers/modules/deploy_utils.py
View File

@ -56,19 +56,13 @@ deploy_opts = [
default='/httpboot', default='/httpboot',
help='ironic-conductor node\'s HTTP root path.', help='ironic-conductor node\'s HTTP root path.',
deprecated_group='pxe'), deprecated_group='pxe'),
# TODO(rameshg87): Remove the deprecated names for the below two options in
# Mitaka release.
cfg.IntOpt('erase_devices_priority', cfg.IntOpt('erase_devices_priority',
deprecated_name='agent_erase_devices_priority',
deprecated_group='agent',
help=_('Priority to run in-band erase devices via the Ironic ' help=_('Priority to run in-band erase devices via the Ironic '
'Python Agent ramdisk. If unset, will use the priority ' 'Python Agent ramdisk. If unset, will use the priority '
'set in the ramdisk (defaults to 10 for the ' 'set in the ramdisk (defaults to 10 for the '
'GenericHardwareManager). If set to 0, will not run ' 'GenericHardwareManager). If set to 0, will not run '
'during cleaning.')), 'during cleaning.')),
cfg.IntOpt('erase_devices_iterations', cfg.IntOpt('erase_devices_iterations',
deprecated_name='agent_erase_devices_iterations',
deprecated_group='agent',
default=1, default=1,
help=_('Number of iterations to be run for erasing devices.')), help=_('Number of iterations to be run for erasing devices.')),
cfg.BoolOpt('power_off_after_deploy_failure', cfg.BoolOpt('power_off_after_deploy_failure',

9
releasenotes/notes/remove-deprecated-option-names-6d5d53cc70dd2d49.yaml Normal file
View File

@ -0,0 +1,9 @@
---
upgrade:
- |
In the config section ``[agent]`` two config options were deprecated in the
Liberty cycle and they have been removed. The options were named:
* ``[agent]/agent_erase_devices_priority``
* ``[agent]/agent_erase_devices_iterations``