Remove legacy config option 'connection_type'
'connection_type' is a legacy config option originated from Nova. Nova used this option to specify underlying virtualization type for compute service and had deprecated it (with 'compute_driver') in Folsom and had it removed in later release. In Cinder Folsom release, the XenSMDriver in Cinder used this config option to verify the target hypervisor but in Grizzly XenSMDriver has been renamed and refactored and no longer used this config. Therefore, this option is dead for a long time, and should be removed. Change-Id: I4d72f31302fa813df42e71224151148a9c4a76c7
This commit is contained in:
parent
40a7da8c3f
commit
fce28fe9ce
|
@ -56,10 +56,6 @@ def _get_my_ip():
|
|||
|
||||
|
||||
core_opts = [
|
||||
cfg.StrOpt('connection_type',
|
||||
default=None,
|
||||
help='Virtualization api connection type : libvirt, xenapi, '
|
||||
'or fake'),
|
||||
cfg.StrOpt('api_paste_config',
|
||||
default="api-paste.ini",
|
||||
help='File name for the paste.deploy config for cinder-api'),
|
||||
|
|
|
@ -141,8 +141,7 @@ def return_disassociate_all(context, id):
|
|||
class QoSSpecManageApiTest(test.TestCase):
|
||||
def setUp(self):
|
||||
super(QoSSpecManageApiTest, self).setUp()
|
||||
self.flags(connection_type='fake',
|
||||
host='fake',
|
||||
self.flags(host='fake',
|
||||
notification_driver=[test_notifier.__name__])
|
||||
self.controller = qos_specs_manage.QoSSpecsController()
|
||||
#reset notifier drivers left over from other api/contrib tests
|
||||
|
|
|
@ -65,8 +65,7 @@ class VolumeTypesExtraSpecsTest(test.TestCase):
|
|||
|
||||
def setUp(self):
|
||||
super(VolumeTypesExtraSpecsTest, self).setUp()
|
||||
self.flags(connection_type='fake',
|
||||
host='fake',
|
||||
self.flags(host='fake',
|
||||
notification_driver=[test_notifier.__name__])
|
||||
self.stubs.Set(cinder.db, 'volume_type_get', volume_type_get)
|
||||
self.api_path = '/v2/fake/os-volume-types/1/extra_specs'
|
||||
|
|
|
@ -64,8 +64,7 @@ def return_volume_types_get_by_name(context, name):
|
|||
class VolumeTypesManageApiTest(test.TestCase):
|
||||
def setUp(self):
|
||||
super(VolumeTypesManageApiTest, self).setUp()
|
||||
self.flags(connection_type='fake',
|
||||
host='fake',
|
||||
self.flags(host='fake',
|
||||
notification_driver=[test_notifier.__name__])
|
||||
self.controller = types_manage.VolumeTypesManageController()
|
||||
"""to reset notifier drivers left over from other api/contrib tests"""
|
||||
|
|
|
@ -51,8 +51,7 @@ class VolumeTypeEncryptionTest(test.TestCase):
|
|||
|
||||
def setUp(self):
|
||||
super(VolumeTypeEncryptionTest, self).setUp()
|
||||
self.flags(connection_type='fake',
|
||||
host='fake',
|
||||
self.flags(host='fake',
|
||||
notification_driver=[test_notifier.__name__])
|
||||
self.api_path = '/v2/fake/os-volume-types/1/encryption'
|
||||
"""to reset notifier drivers left over from other api/contrib tests"""
|
||||
|
|
|
@ -36,7 +36,6 @@ def set_defaults(conf):
|
|||
conf.set_default('volume_driver',
|
||||
'cinder.tests.fake_driver.FakeISCSIDriver')
|
||||
conf.set_default('iscsi_helper', 'fake')
|
||||
conf.set_default('connection_type', 'fake')
|
||||
conf.set_default('fake_rabbit', True)
|
||||
conf.set_default('rpc_backend', 'cinder.openstack.common.rpc.impl_fake')
|
||||
conf.set_default('iscsi_num_targets', 8)
|
||||
|
|
|
@ -45,8 +45,7 @@ class BackupTestCase(test.TestCase):
|
|||
def setUp(self):
|
||||
super(BackupTestCase, self).setUp()
|
||||
vol_tmpdir = tempfile.mkdtemp()
|
||||
self.flags(connection_type='fake',
|
||||
volumes_dir=vol_tmpdir)
|
||||
self.flags(volumes_dir=vol_tmpdir)
|
||||
self.backup_mgr = \
|
||||
importutils.import_object(CONF.backup_manager)
|
||||
self.backup_mgr.host = 'testhost'
|
||||
|
|
|
@ -92,8 +92,7 @@ class BaseVolumeTestCase(test.TestCase):
|
|||
def setUp(self):
|
||||
super(BaseVolumeTestCase, self).setUp()
|
||||
vol_tmpdir = tempfile.mkdtemp()
|
||||
self.flags(connection_type='fake',
|
||||
volumes_dir=vol_tmpdir,
|
||||
self.flags(volumes_dir=vol_tmpdir,
|
||||
notification_driver=[test_notifier.__name__])
|
||||
self.volume = importutils.import_object(CONF.volume_manager)
|
||||
self.context = context.get_admin_context()
|
||||
|
|
|
@ -43,8 +43,7 @@ class UsageInfoTestCase(test.TestCase):
|
|||
|
||||
def setUp(self):
|
||||
super(UsageInfoTestCase, self).setUp()
|
||||
self.flags(connection_type='fake',
|
||||
host='fake',
|
||||
self.flags(host='fake',
|
||||
notification_driver=[test_notifier.__name__])
|
||||
self.volume = importutils.import_object(CONF.volume_manager)
|
||||
self.user_id = 'fake'
|
||||
|
|
|
@ -238,10 +238,6 @@
|
|||
# Options defined in cinder.common.config
|
||||
#
|
||||
|
||||
# Virtualization api connection type : libvirt, xenapi, or
|
||||
# fake (string value)
|
||||
#connection_type=<None>
|
||||
|
||||
# File name for the paste.deploy config for cinder-api (string
|
||||
# value)
|
||||
#api_paste_config=api-paste.ini
|
||||
|
|
Loading…
Reference in New Issue