Merge "Remove [compute-feature-enabled] block_migrate_cinder_iscsi"
This commit is contained in:
commit
2921b3d3f4
@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The deprecated ``[compute-feature-enabled] block_migrate_cinder_iscsi``
|
||||||
|
option has been removed.
|
||||||
|
Now the ``[compute-feature-enabled] block_migration_for_live_migration``
|
||||||
|
option is solely used to determine when to run block migration based tests
|
||||||
|
during live migration.
|
@ -175,9 +175,6 @@ class LiveMigrationTest(LiveMigrationTestBase):
|
|||||||
@testtools.skipIf(not CONF.compute_feature_enabled.
|
@testtools.skipIf(not CONF.compute_feature_enabled.
|
||||||
block_migration_for_live_migration,
|
block_migration_for_live_migration,
|
||||||
'Block Live migration not available')
|
'Block Live migration not available')
|
||||||
@testtools.skipIf(not CONF.compute_feature_enabled.
|
|
||||||
block_migrate_cinder_iscsi,
|
|
||||||
'Block Live migration not configured for iSCSI')
|
|
||||||
@utils.services('volume')
|
@utils.services('volume')
|
||||||
def test_live_block_migration_with_attached_volume(self):
|
def test_live_block_migration_with_attached_volume(self):
|
||||||
"""Test the live-migration of an instance with an attached volume.
|
"""Test the live-migration of an instance with an attached volume.
|
||||||
|
@ -501,18 +501,6 @@ ComputeFeaturesGroup = [
|
|||||||
default=False,
|
default=False,
|
||||||
help="Does the test environment use block devices for live "
|
help="Does the test environment use block devices for live "
|
||||||
"migration"),
|
"migration"),
|
||||||
cfg.BoolOpt('block_migrate_cinder_iscsi',
|
|
||||||
default=False,
|
|
||||||
help="Does the test environment support block migration with "
|
|
||||||
"Cinder iSCSI volumes. Note: libvirt >= 1.2.17 is required "
|
|
||||||
"to support this if using the libvirt compute driver.",
|
|
||||||
deprecated_for_removal=True,
|
|
||||||
deprecated_reason='This option duplicates the more generic '
|
|
||||||
'[compute-feature-enabled]/block_migration '
|
|
||||||
'_for_live_migration now that '
|
|
||||||
'MIN_LIBVIRT_VERSION is >= 1.2.17 on all '
|
|
||||||
'branches from stable/rocky and will be '
|
|
||||||
'removed in a future release.'),
|
|
||||||
cfg.BoolOpt('can_migrate_between_any_hosts',
|
cfg.BoolOpt('can_migrate_between_any_hosts',
|
||||||
default=True,
|
default=True,
|
||||||
help="Does the test environment support migrating between "
|
help="Does the test environment support migrating between "
|
||||||
|
Loading…
x
Reference in New Issue
Block a user