From 74f92e1397006e1206acae5ee9f9cfc759fd0f91 Mon Sep 17 00:00:00 2001 From: Matthew Edmonds Date: Fri, 26 May 2017 18:42:09 -0400 Subject: [PATCH] Remove volume_group_vios_name nova-powervm commit c64087adb003925d33f1bd75c7119f4c0f83afd6 removed the only code using CONF.localdisk.volume_group_vios_name but neglected to remove the conf definition itself or the references in devref. This change removes both since they no longer apply. Change-Id: I2bd2739c99d7fd12f9a111dec62286f04e345e6b --- doc/source/devref/usage.rst | 11 +---------- nova_powervm/conf/powervm.py | 9 --------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/doc/source/devref/usage.rst b/doc/source/devref/usage.rst index 1876fac8..f6e12d6c 100644 --- a/doc/source/devref/usage.rst +++ b/doc/source/devref/usage.rst @@ -103,7 +103,7 @@ Disk Options | | Group exists on one of the Virtual I/O Servers, then no | | | further config is needed. If multiple volume groups exist,| | | then further specification can be done via the | -| | volume_group_* options. | +| | volume_group_name option. | | | | | | Live migration is not supported with a localdisk config. | | | | @@ -123,15 +123,6 @@ Disk Options | | than one non-rootvg volume group exists across the | | | Virtual I/O Servers, then this attribute must be specified.| +--------------------------------------+------------------------------------------------------------+ -| volume_group_vios_name = None | (StrOpt) (Optional) The name of the Virtual I/O Server | -| | hosting the volume group. If this is not specified, the | -| | system will query through the Virtual I/O Servers looking | -| | for one that matches the volume_group_vios_name. This is | -| | only needed if the system has multiple Virtual I/O Servers | -| | with a non-rootvg volume group whose name is duplicated. | -| | | -| | Typically paired with the volume_group_name attribute. | -+--------------------------------------+------------------------------------------------------------+ Volume Options diff --git a/nova_powervm/conf/powervm.py b/nova_powervm/conf/powervm.py index ab48757b..4d425a59 100644 --- a/nova_powervm/conf/powervm.py +++ b/nova_powervm/conf/powervm.py @@ -102,15 +102,6 @@ localdisk_opts = [ 'disk_driver is localdisk, then this attribute must be ' 'specified. It is strongly recommended NOT to use ' 'rootvg.'), - cfg.StrOpt('volume_group_vios_name', - default='', - help='(Optional) The name of the Virtual I/O Server hosting ' - 'the volume group. If this is not specified, the system ' - 'will query through the Virtual I/O Servers looking for ' - 'one that matches the volume_group_vios_name. This is ' - 'only needed if the system has multiple Virtual I/O ' - 'Servers with a volume group whose name matches the ' - '`volume_group_name` option.') ] ssp_opts = [