Remove unused volume_adapter conf

The [powervm]volume_adapter conf setting has not been used since
ebee3eae88 was merged during ocata
development. This removes the unused remnants.

Change-Id: I0c5c1afce6528115754adaa93edf21ee2126a621
This commit is contained in:
Matthew Edmonds 2018-06-06 14:06:59 -04:00
parent f52018bad8
commit 23bffd275d
2 changed files with 0 additions and 7 deletions

View File

@ -46,11 +46,6 @@ powervm_opts = [
default='/tmp/cfgdrv/',
help='The location where the config drive ISO files should be '
'built.'),
cfg.StrOpt('volume_adapter',
choices=['fibre_channel', 'iscsi'], ignore_case=True,
default='fibre_channel',
help='The volume adapter to use for PowerVM volumes. '
'Valid options are: fibre_channel, iscsi'),
cfg.StrOpt('pvm_vswitch_for_novalink_io',
default='NovaLinkVEABridge',
help="Name of the PowerVM virtual switch to be used when "

View File

@ -216,7 +216,6 @@ class TestPowerVMDriver(test.NoDBTestCase):
mock_initiators.return_value = initiators
self.flags(volume_adapter='fibre_channel', group='powervm')
vol_connector = self.drv.get_volume_connector(mock.Mock())
self.assertIsNotNone(vol_connector['wwpns'])
self.assertIsNotNone(vol_connector['host'])
@ -899,7 +898,6 @@ class TestPowerVMDriver(test.NoDBTestCase):
# Validate the other volume types only return SCSI mappings
vol_types = ['iscsi', 'gpfs', 'local', 'nfs']
for vol_type in vol_types:
self.flags(volume_adapter='iscsi', group='powervm')
mock_bdm = {'connection_info':
{'driver_volume_type': vol_type}}
xag = self.drv._get_inst_xag(mock.Mock(), [mock_bdm])