Remove [compute-feature-enabled] block_migrate_cinder_iscsi
This option was removed a few years ago[1], and is no longer needed
after queens EOL, according to the commit message.
[1] 48fe99faf2ee92ca1c1e6eeac5519075095f33bc
Change-Id: Ia3985fcdda570c5e0cd32bdd87abfabb0ff516ac
diff --git a/releasenotes/notes/remove-compute-feature-enabled-block-migrate-cinder-iscsi-882da88096019f3c.yaml b/releasenotes/notes/remove-compute-feature-enabled-block-migrate-cinder-iscsi-882da88096019f3c.yaml
new file mode 100644
index 0000000..2808677
--- /dev/null
+++ b/releasenotes/notes/remove-compute-feature-enabled-block-migrate-cinder-iscsi-882da88096019f3c.yaml
@@ -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.
diff --git a/tempest/api/compute/admin/test_live_migration.py b/tempest/api/compute/admin/test_live_migration.py
index d68334f..b57d73c 100644
--- a/tempest/api/compute/admin/test_live_migration.py
+++ b/tempest/api/compute/admin/test_live_migration.py
@@ -175,9 +175,6 @@
@testtools.skipIf(not CONF.compute_feature_enabled.
block_migration_for_live_migration,
'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')
def test_live_block_migration_with_attached_volume(self):
"""Test the live-migration of an instance with an attached volume.
diff --git a/tempest/config.py b/tempest/config.py
index 7978755..a27c987 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -501,18 +501,6 @@
default=False,
help="Does the test environment use block devices for live "
"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',
default=True,
help="Does the test environment support migrating between "