From 2ca50bc7ee96f69c0ee52d87358a5d47eceee977 Mon Sep 17 00:00:00 2001 From: Ruby Loo Date: Thu, 19 May 2016 13:59:07 -0400 Subject: [PATCH] Remove deprecated disk util configs This removes support for the deprecated configuration options in the [deploy] group: efi_system_partition_size, dd_block_size, iscsi_verify_attempts. They are available in the [disk_util] group. The three configuration options in [disk_util] had originally been in ironic code (the [deploy] group) and was moved in Feb 2015 to this library. Ironic started using this library in (early) Mitaka development cycle. Change-Id: Ie8ee2aab69ef2f0d711b276f3538c832c3369f29 --- ironic_lib/disk_utils.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ironic_lib/disk_utils.py b/ironic_lib/disk_utils.py index bb99de8..7f3d33d 100644 --- a/ironic_lib/disk_utils.py +++ b/ironic_lib/disk_utils.py @@ -45,21 +45,18 @@ opts = [ cfg.IntOpt('efi_system_partition_size', default=200, help='Size of EFI system partition in MiB when configuring ' - 'UEFI systems for local boot.', - deprecated_group='deploy'), + 'UEFI systems for local boot.'), cfg.IntOpt('bios_boot_partition_size', default=1, help='Size of BIOS Boot partition in MiB when configuring ' 'GPT partitioned systems for local boot in BIOS.'), cfg.StrOpt('dd_block_size', default='1M', - help='Block size to use when writing to the nodes disk.', - deprecated_group='deploy'), + help='Block size to use when writing to the nodes disk.'), cfg.IntOpt('iscsi_verify_attempts', default=3, help='Maximum attempts to verify an iSCSI connection is ' - 'active, sleeping 1 second between attempts.', - deprecated_group='deploy'), + 'active, sleeping 1 second between attempts.'), ] CONF = cfg.CONF