commit f2902eaa6e3992309d169a5d095b4c2c482aa531
author Jenkins <jenkins@review.openstack.org> Mon Mar 30 02:41:43 2015 +0000
committer Gerrit Code Review <review@openstack.org> Mon Mar 30 02:41:43 2015 +0000
tree f558bc4b3bef08c5759a7a736828865163cf8e30
parent d0057586b9c2313c9d5eb370d3eb9b67e54f566f
parent 0a5788f52a30d34beda14e2fddf8883d3df34173

Merge "Update description of Enable block_migrate_cinder_iscsi"

etc/tempest.conf.sample

diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index f5e0cf8..7c5461b 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -395,7 +395,8 @@
 #block_migration_for_live_migration = false
 
 # Does the test environment block migration support cinder iSCSI
-# volumes (boolean value)
+# volumes. Note, libvirt doesn't support this, see
+# https://bugs.launchpad.net/nova/+bug/1398999 (boolean value)
 #block_migrate_cinder_iscsi = false
 
 # Enable VNC console. This configuration value should be same as

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index f884baa..78952f1 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -327,7 +327,8 @@
     cfg.BoolOpt('block_migrate_cinder_iscsi',
                 default=False,
                 help="Does the test environment block migration support "
-                     "cinder iSCSI volumes"),
+                "cinder iSCSI volumes. Note, libvirt doesn't support this, "
+                "see https://bugs.launchpad.net/nova/+bug/1398999"),
     cfg.BoolOpt('vnc_console',
                 default=False,
                 help='Enable VNC console. This configuration value should '