From 15674eee47632e63090cb3c498015a8bb4b998ed Mon Sep 17 00:00:00 2001 From: Ramamani Yeleswarapu Date: Mon, 11 Apr 2016 16:25:21 -0700 Subject: [PATCH] Remove two deprecated config option names from [agent] section 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 9a35ca19b4872af2e02cb83b21a3746732802e74 Change-Id: I9c6df0979c2814b5f26f8fb596de6cf07e4f76aa --- etc/ironic/ironic.conf.sample | 2 -- ironic/drivers/modules/deploy_utils.py | 6 ------ .../remove-deprecated-option-names-6d5d53cc70dd2d49.yaml | 9 +++++++++ 3 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 releasenotes/notes/remove-deprecated-option-names-6d5d53cc70dd2d49.yaml diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index d4073451d7..7a5cc9a1ae 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -916,12 +916,10 @@ # Agent ramdisk. If unset, will use the priority set in the # ramdisk (defaults to 10 for the GenericHardwareManager). If # set to 0, will not run during cleaning. (integer value) -# Deprecated group/name - [agent]/agent_erase_devices_priority #erase_devices_priority = # Number of iterations to be run for erasing devices. (integer # value) -# Deprecated group/name - [agent]/agent_erase_devices_iterations #erase_devices_iterations = 1 # Whether to power off a node after deploy failure. Defaults diff --git a/ironic/drivers/modules/deploy_utils.py b/ironic/drivers/modules/deploy_utils.py index 7baa13cb68..0d6819dd90 100644 --- a/ironic/drivers/modules/deploy_utils.py +++ b/ironic/drivers/modules/deploy_utils.py @@ -56,19 +56,13 @@ deploy_opts = [ default='/httpboot', help='ironic-conductor node\'s HTTP root path.', deprecated_group='pxe'), - # TODO(rameshg87): Remove the deprecated names for the below two options in - # Mitaka release. 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 ' 'Python Agent ramdisk. If unset, will use the priority ' 'set in the ramdisk (defaults to 10 for the ' 'GenericHardwareManager). If set to 0, will not run ' 'during cleaning.')), cfg.IntOpt('erase_devices_iterations', - deprecated_name='agent_erase_devices_iterations', - deprecated_group='agent', default=1, help=_('Number of iterations to be run for erasing devices.')), cfg.BoolOpt('power_off_after_deploy_failure', diff --git a/releasenotes/notes/remove-deprecated-option-names-6d5d53cc70dd2d49.yaml b/releasenotes/notes/remove-deprecated-option-names-6d5d53cc70dd2d49.yaml new file mode 100644 index 0000000000..3231c4d750 --- /dev/null +++ b/releasenotes/notes/remove-deprecated-option-names-6d5d53cc70dd2d49.yaml @@ -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`` +